diff -r 74139325d305 -r b78e77619152 src/org/sonews/daemon/command/ListCommand.java
--- a/src/org/sonews/daemon/command/ListCommand.java	Sun Aug 29 18:17:37 2010 +0200
+++ b/src/org/sonews/daemon/command/ListCommand.java	Sun Sep 11 15:05:04 2011 +0200
@@ -24,7 +24,7 @@
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 import org.sonews.daemon.NNTPConnection;
-import org.sonews.storage.Channel;
+import org.sonews.storage.Group;
 import org.sonews.storage.StorageBackendException;
 import org.sonews.util.Log;
 
@@ -74,8 +74,8 @@
 				conn.println(".");
 			} else if (command[1].equalsIgnoreCase("NEWSGROUPS")) {
 				conn.println("215 information follows");
-				final List<Channel> list = Channel.getAll();
-				for (Channel g : list) {
+				final List<Group> list = Group.getAll();
+				for (Group g : list) {
 					conn.println(g.getName() + "\t" + "-");
 				}
 				conn.println(".");
@@ -103,10 +103,10 @@
 	private void printGroupInfo(NNTPConnection conn, String pattern)
 		throws IOException, StorageBackendException
 	{
-		final List<Channel> groups = Channel.getAll();
+		final List<Group> groups = Group.getAll();
 		if (groups != null) {
 			conn.println("215 list of newsgroups follows");
-			for (Channel g : groups) {
+			for (Group g : groups) {
 				try {
 					Matcher matcher = pattern == null
 						? null : Pattern.compile(pattern).matcher(g.getName());