diff --git a/world/net/irc/common.c b/world/net/irc/common.c
index 85b0f5c..7b5aa8c 100644
--- a/world/net/irc/common.c
+++ b/world/net/irc/common.c
@@ -55,7 +55,7 @@ ircMsg(from, cmd, args, text, all) {
 case "motd":
 		motd();
 		return 1;
-#ifndef BETA
+#ifndef GAMMA
 case "lusers":
 		lusers();
 		return 1;
@@ -137,7 +137,7 @@ motd() {
 	return 1;
 }
 
-#ifndef BETA
+#ifndef GAMMA
 lusers() {
 # ifndef _flag_disable_query_server
 	reply(RPL_LUSERCLIENT, ":There are " + amount_people()
diff --git a/world/net/irc/user.c b/world/net/irc/user.c
index d922ebe..93fc161 100644
--- a/world/net/irc/user.c
+++ b/world/net/irc/user.c
@@ -854,7 +854,7 @@ logon() {
 	// SILENCE: ach und ich weiss nicht ob /quote silence bzw /silence den psyced befehl silence aufruft, aber imo sollte er das aus verwirrungs-vermeidungs-gruenden nicht tun. silence im irc ist serverseitiges ignore.
 
 # endif
-# ifndef BETA
+# ifndef GAMMA
 	lusers();
 # endif
 	motd();
@@ -862,7 +862,7 @@ logon() {
 	// the following things happen after logon, because the textdb isn't
 	// available earlier. if this order of things is not acceptable, then
 	// we have to run sTextPath twice (see above)
-# ifdef BETA
+# ifdef GAMMA
 #  ifndef _flag_disable_query_server
 	sendmsg("/", "_request_user_amount", 0, ([]));
 	// reply.h says RPL_LUSERME is mandatory.. huh.. FIXME?
diff --git a/world/net/place/archetype.gen b/world/net/place/archetype.gen
index 81aa3c1..ee3b50e 100644
--- a/world/net/place/archetype.gen
+++ b/world/net/place/archetype.gen
@@ -128,7 +128,7 @@
 #include <uniform.h>
 #include <driver.h>
 
-#ifdef BETA
+#ifdef GAMMA
 # define ECHOES
 #endif
 
diff --git a/world/net/psyc/edit.i b/world/net/psyc/edit.i
index 3c7af56..da11828 100644
--- a/world/net/psyc/edit.i
+++ b/world/net/psyc/edit.i
@@ -211,7 +211,7 @@ static varargs string psyc_render(mixed source, string mc, mixed data,
 # if 1
 	if (context = vars["_INTERNAL_context"]) {
 		P4(("retransmit: %O - deleting source\n", data))
-# ifdef ALPHA
+# ifdef BETA
 		if (source != context && !vars["_source_relay"])
 		    vars["_source_relay"] = source;
 # else
@@ -224,7 +224,7 @@ static varargs string psyc_render(mixed source, string mc, mixed data,
 	else if (context = vars["_context"]) {
 		P4(("1st transmit: %O - deleting source and target\n", data))
 		// we're not multipeering, so no sources here.
-# ifdef ALPHA
+# ifdef BETA
 		if (source != context && !vars["_source_relay"])
 		    vars["_source_relay"] = source;
 # else
diff --git a/world/net/usercmd.i b/world/net/usercmd.i
index d8fe755..097c273 100644
--- a/world/net/usercmd.i
+++ b/world/net/usercmd.i
@@ -255,7 +255,7 @@ cmd(a, args, dest, command) {
 		people();
 		break;
 	case "lusers":
-#ifndef BETA
+#ifndef GAMMA
 		if (sizeof(args) > 1 && is_formal(args[1])) {
 		    sendmsg(args[1], "_request_user_amount", 
 			    "[_nick] would like to know how many users you have.",
@@ -2051,7 +2051,7 @@ friendcast(mc, data, vars, friendivity) {
         // but doesn't make much sense as long as we cannot sort out dupes
         //if (friendivity) vars["_amount_friendivity"] = friendivity;
         if (castmsg(mc || "_message_friends", data, vars))
-#ifdef BETA
+#ifdef GAMMA
 	    // to put the echo into lastlog, we need to msg it to ourselves
             msg(0, mc? "_echo"+mc : "_message_echo_friends", data, vars);
 #else