diff -r 7f84f4de2893 -r c713ca00a4a7 src/org/sonews/storage/Storage.java
--- a/src/org/sonews/storage/Storage.java	Mon Jun 06 20:12:21 2011 +0200
+++ b/src/org/sonews/storage/Storage.java	Tue Sep 13 19:08:15 2011 +0200
@@ -60,7 +60,7 @@
 	List<Pair<Long, ArticleHead>> getArticleHeads(Group group, long first, long last)
 			throws StorageBackendException;
 
-	List<Pair<Long, String>> getArticleHeaders(Channel channel, long start, long end,
+	List<Pair<Long, String>> getArticleHeaders(Group group, long start, long end,
 			String header, String pattern)
 			throws StorageBackendException;
 
@@ -74,7 +74,7 @@
 			throws StorageBackendException;
 
 	int getEventsCount(int eventType, long startTimestamp, long endTimestamp,
-			Channel channel)
+			Group group)
 			throws StorageBackendException;
 
 	double getEventsPerHour(int key, long gid)
@@ -86,7 +86,7 @@
 	Group getGroup(String name)
 			throws StorageBackendException;
 
-	List<Channel> getGroups()
+	List<Group> getGroups()
 			throws StorageBackendException;
 
 	/**