diff --git a/benchmarks/Makefile b/benchmarks/Makefile
index 576cf20..e5bf7c1 100644
--- a/benchmarks/Makefile
+++ b/benchmarks/Makefile
@@ -4,8 +4,8 @@ CRUNS = $(patsubst %, run-c-%, $(BENCHMARKS))
 ACTS = $(patsubst %, %.act, $(BENCHMARKS))
 ACTRUNS = $(patsubst %, run-act-%, $(BENCHMARKS))
 TIME = time -f "\ttime: %U"
-ELITE = $(ELITE_ROOT)/compiler/elite
-ACTEMU = $(ELITE_ROOT)/emulator/actemu
+ELITE = $(ACTORA_ROOT)/compiler/elite
+ACTEMU = $(ACTORA_ROOT)/emulator/actemu
 
 .PHONY: all
 all: $(CS) $(REDS)
@@ -17,10 +17,10 @@ run-c: $(CRUNS)
 run-act: $(ACTRUNS)
 
 $(ELITE):
-	make -C $(ELITE_ROOT)/compiler
+	make -C $(ACTORA_ROOT)/compiler
 
 $(REDEMU):
-	make -C $(ELITE_ROOT)/emulator
+	make -C $(ACTORA_ROOT)/emulator
 
 %.act: %.erl $(ELITE)
 	$(ELITE) -b $< > $@
diff --git a/blarney b/blarney
index 8ef1b3c..04140b0 160000
--- a/blarney
+++ b/blarney
@@ -1 +1 @@
-Subproject commit 8ef1b3c719cd40c6134db01006d76f09055e4485
+Subproject commit 04140b0ba7181da46fa3515535becaec1991a6a6
diff --git a/compiler/Module.hs b/compiler/Module.hs
index ab89fde..ab59323 100644
--- a/compiler/Module.hs
+++ b/compiler/Module.hs
@@ -29,7 +29,7 @@ loadModule prefix modName = do
     -- Module search paths
     searchPaths :: IO [String]
     searchPaths = do
-      libDir <- lookupEnv "ELITE_ROOT"
+      libDir <- lookupEnv "ACTORA_ROOT"
       return ([prefix] ++ [dir ++ "/lib" | Just dir <- [libDir]])
 
     -- Determine module location
diff --git a/rtl/Config.py b/rtl/Config.py
index 153060e..f27a8e5 100755
--- a/rtl/Config.py
+++ b/rtl/Config.py
@@ -37,4 +37,4 @@
     print("#define " + var + " " + str(p[var]))
 elif mode == "cpp":
   for var in p:
-    print("#define Red" + var + " " + str(p[var]))
+    print("#define Act" + var + " " + str(p[var]))
diff --git a/rtl/Makefile b/rtl/Makefile
index 6c67c9d..cf78fa5 100644
--- a/rtl/Makefile
+++ b/rtl/Makefile
@@ -1,4 +1,4 @@
-BLARNEY_ROOT = $(ELITE_ROOT)/blarney
+BLARNEY_ROOT = $(ACTORA_ROOT)/blarney
 BLC = $(BLARNEY_ROOT)/Scripts/blc
 
 .PHONEY: all