diff --git a/basice2e/clients.goldoutput/client12.out b/basice2e/clients.goldoutput/client12.out
index 3889879f3a12b44a7502aec27b3159c8e2c0bb11..71f22f1d1417a0d2d8fd5a08ab2e3916b791551b 100755
--- a/basice2e/clients.goldoutput/client12.out
+++ b/basice2e/clients.goldoutput/client12.out
@@ -1,4 +1,4 @@
 Sending Message to 2, Jim: Hello, 2
-Message from 31, #general Received: Channel, Hello
+Message from 31, #General Received: Channel, Hello
 Sending Message to 2, Jim: Hello, 2
 Message from 4, Rick Received: Hello, 1
diff --git a/basice2e/clients.goldoutput/client23.out b/basice2e/clients.goldoutput/client23.out
index 661b1d207467f879d94e79e1e115085c7b0ca836..97b0607064970ed2963871daac286d5bc8ef5025 100755
--- a/basice2e/clients.goldoutput/client23.out
+++ b/basice2e/clients.goldoutput/client23.out
@@ -1,4 +1,4 @@
 Sending Message to 3, Ben: Hello, 3
-Message from 31, #general Received: Channel, Hello
+Message from 31, #General Received: Channel, Hello
 Sending Message to 3, Ben: Hello, 3
 Message from 1, David Received: Hello, 2
diff --git a/basice2e/clients.goldoutput/client34.out b/basice2e/clients.goldoutput/client34.out
index 20cd0354a2a7417abf1ea78fd1b1cf16d5a4b1ff..ec71365c33217483b8a17abfeb273717bcc318ca 100755
--- a/basice2e/clients.goldoutput/client34.out
+++ b/basice2e/clients.goldoutput/client34.out
@@ -1,4 +1,4 @@
 Sending Message to 4, Rick: Hello, 4
-Message from 31, #general Received: Channel, Hello
+Message from 31, #General Received: Channel, Hello
 Sending Message to 4, Rick: Hello, 4
 Message from 2, Jim Received: Hello, 3
diff --git a/basice2e/clients.goldoutput/client41.out b/basice2e/clients.goldoutput/client41.out
index 0a3f6f179385e932bf4e545c71b2fd0caeaea7a1..e1b61091593e16f619e7fa0531a498bc069d4347 100755
--- a/basice2e/clients.goldoutput/client41.out
+++ b/basice2e/clients.goldoutput/client41.out
@@ -1,4 +1,4 @@
 Sending Message to 1, David: Hello, 1
-Message from 31, #general Received: Channel, Hello
+Message from 31, #General Received: Channel, Hello
 Sending Message to 1, David: Hello, 1
 Message from 3, Ben Received: Hello, 4
diff --git a/basice2e/clients.goldoutput/client5.out b/basice2e/clients.goldoutput/client5.out
index 1f38da56d6f478828c4fd92757dba68958d15436..6bd764af7e86cf2a600e93d6a80213ef2a07b46b 100644
--- a/basice2e/clients.goldoutput/client5.out
+++ b/basice2e/clients.goldoutput/client5.out
@@ -1,2 +1,2 @@
-Sending Message to 31, #general: Channel, Hello
-Message from 31, #general Received: Channel, Hello
+Sending Message to 31, #General: Channel, Hello
+Message from 31, #General Received: Channel, Hello
diff --git a/basice2e/run.sh b/basice2e/run.sh
index 5877f03207c3812a7ea17c9e5116e657bd94f5e5..2f5f514693192607e4fd557cc0e6056399656f78 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -90,7 +90,7 @@ runclients() {
 }
 
 # Start a channelbot server
-CHANNELCMD="../bin/client channelbot -v -i 31 --nick \"#general\" --numnodes 5 -s $LASTNODE  -f blobchannel --noratchet"
+CHANNELCMD="../bin/client channelbot -v -i 31 --nick \"#General\" --numnodes 5 -s $LASTNODE  -f blobchannel --noratchet"
 eval $CHANNELCMD >> $CHANNELOUT 2>&1 &
 PIDVAL=$!
 echo $PIDVAL >> results/serverpids