diff --git a/runtime/tests/Makefile b/runtime/tests/Makefile
index 5fe58d9..32d2c82 100644
--- a/runtime/tests/Makefile
+++ b/runtime/tests/Makefile
@@ -1,7 +1,5 @@
 include Makefile.inc
 
-BENCH_DIR=../../${WASM2OBJ_NAME}/code_benches
-
 TESTS=fibonacci empty work work1k work10k work100k work1m
 TESTS+=forever filesys sockserver sockclient empty
 
@@ -23,10 +21,10 @@ clean:
 %_rt:
 	@mkdir -p ${TMP_DIR}
 	@echo "Compiling $(@:%_rt=%)"
-	${WASMCC} ${$(@:%_rt=%)_CFLAGS} ${WASMCFLAGS} ${OPTFLAGS} $(@:%_rt=%)/*.c $(WASM2OBJ_DUMMY) -o ${TMP_DIR}/$(@:%_rt=%).wasm
-	${WASM2OBJ_EXECUTABLE} ${TMP_DIR}/$(@:%_rt=%).wasm -o ${TMP_DIR}/$(@:%_rt=%).bc
-	${CC} ${CFLAGS} ${OPTFLAGS} -D${USE_MEM} -D${ARCH} ${TMP_DIR}/$(@:%_rt=%).bc ${WASM2OBJ_MEMC} ${WASM2OBJ_RT_LIBC} ${WASM2OBJ_RT_ENV} ${WASM2OBJ_RT_RT} -lm -o ${TMP_DIR}/$(@:%_rt=%)_wasm.out
-	${WASM2OBJ_EXECUTABLE} --inline-constant-globals --runtime-globals ${TMP_DIR}/$(@:%_rt=%).wasm -o ${TMP_DIR}/$(@:%_rt=%).bc
+	${WASMCC} ${$(@:%_rt=%)_CFLAGS} ${WASMCFLAGS} ${OPTFLAGS} $(@:%_rt=%)/*.c $(AWSM_DUMMY) -o ${TMP_DIR}/$(@:%_rt=%).wasm
+	${AWSM_EXECUTABLE} ${TMP_DIR}/$(@:%_rt=%).wasm -o ${TMP_DIR}/$(@:%_rt=%).bc
+	${CC} ${CFLAGS} ${OPTFLAGS} -D${USE_MEM} -D${ARCH} ${TMP_DIR}/$(@:%_rt=%).bc ${AWSM_MEMC} ${AWSM_RT_LIBC} ${AWSM_RT_ENV} ${AWSM_RT_RT} -lm -o ${TMP_DIR}/$(@:%_rt=%)_wasm.out
+	${AWSM_EXECUTABLE} --inline-constant-globals --runtime-globals ${TMP_DIR}/$(@:%_rt=%).wasm -o ${TMP_DIR}/$(@:%_rt=%).bc
 	${CC} --shared -fPIC ${OPTFLAGS} -I${SERVERLESS_RT_INC} -D${USE_MEM} ${TMP_DIR}/$(@:%_rt=%).bc ${SERVERLESS_MEMC} ${SERVERLESS_WASMISA} -o ${TMP_DIR}/$(@:%_rt=%)_wasm.so
 	@cp ${TMP_DIR}/$(@:%_rt=%)_wasm.so ${SERVERLESS_BIN_DIR} 
 #	@rm -rf ${TMP_DIR}
diff --git a/runtime/tests/Makefile.inc b/runtime/tests/Makefile.inc
index c60b83e..b2ba2c4 100644
--- a/runtime/tests/Makefile.inc
+++ b/runtime/tests/Makefile.inc
@@ -18,18 +18,18 @@ WASMCFLAGS=${WASMLINKFLAGS} -nostartfiles
 # aWsm Compiler Runtime (WebAssembly -> Native)
 # Currently, the component which compiles WebAssembly modules to native code, is named aWsm
 # However, the executable itself still currently retains the older name silverfish
-WASM2OBJ_NAME=awsm
-WASM2OBJ_EXECUTABLE=silverfish
-WASM2OBJ_BASE_DIR=../../${WASM2OBJ_NAME}
-WASM2OBJ_RT_DIR=${WASM2OBJ_BASE_DIR}/runtime/
-WASM2OBJ_RT_MEM=${WASM2OBJ_RT_DIR}/memory/
-WASM2OBJ_RT_LIBC=${WASM2OBJ_RT_DIR}/libc/libc_backing.c
-WASM2OBJ_RT_RT=${WASM2OBJ_RT_DIR}/runtime.c
-WASM2OBJ_RT_ENV=${WASM2OBJ_RT_DIR}/libc/env.c
+AWSM_NAME=awsm
+AWSM_EXECUTABLE=silverfish
+AWSM_BASE_DIR=../../${AWSM_NAME}
+AWSM_RT_DIR=${AWSM_BASE_DIR}/runtime/
+AWSM_RT_MEM=${AWSM_RT_DIR}/memory/
+AWSM_RT_LIBC=${AWSM_RT_DIR}/libc/libc_backing.c
+AWSM_RT_RT=${AWSM_RT_DIR}/runtime.c
+AWSM_RT_ENV=${AWSM_RT_DIR}/libc/env.c
 # Is seems like the arch specific code no longer exists
-# WASM2OBJ_RT_ENV=${WASM2OBJ_RT_DIR}/libc/env.c ${WASM2OBJ_RT_DIR}/libc/env_${ARCH}.c
-WASM2OBJ_MEMC=${WASM2OBJ_RT_MEM}/${MEMC_64}
-WASM2OBJ_DUMMY=${WASM2OBJ_BASE_DIR}/code_benches/dummy.c
+# AWSM_RT_ENV=${AWSM_RT_DIR}/libc/env.c ${AWSM_RT_DIR}/libc/env_${ARCH}.c
+AWSM_MEMC=${AWSM_RT_MEM}/${MEMC_64}
+AWSM_DUMMY=${AWSM_BASE_DIR}/code_benches/dummy.c
 
 # for SLEdge
 SERVERLESS_BASE_DIR=../../