diff --git a/decoder/build/linux/makefile b/decoder/build/linux/makefile
index 31e2f66..4befae3 100644
--- a/decoder/build/linux/makefile
+++ b/decoder/build/linux/makefile
@@ -34,9 +34,9 @@
 # LINUX64=1     create a 64 bit build
 
 # Set project root - relative to build directory
-ifeq ($(RCTDL_ROOT),)
-RCTDL_ROOT := $(shell pwd | sed 's,/build/linux.*,,')
-export RCTDL_ROOT
+ifeq ($(OCSD_ROOT),)
+OCSD_ROOT := $(shell pwd | sed 's,/build/linux.*,,')
+export OCSD_ROOT
 endif
 
 # library names
@@ -50,12 +50,12 @@
 ARCH := $(shell uname -m 2>/dev/null || echo not)
 
 # source root directories
-export RCTDL_LIB_ROOT=$(RCTDL_ROOT)/lib
+export OCSD_LIB_ROOT=$(OCSD_ROOT)/lib
 
-export RCTDL_INCLUDE=$(RCTDL_ROOT)/include
-export RCTDL_SOURCE=$(RCTDL_ROOT)/source
+export OCSD_INCLUDE=$(OCSD_ROOT)/include
+export OCSD_SOURCE=$(OCSD_ROOT)/source
 
-export RCTDL_TESTS=$(RCTDL_ROOT)/tests
+export OCSD_TESTS=$(OCSD_ROOT)/tests
 
 # tools
 export MASTER_CC=gcc
@@ -101,9 +101,9 @@
 
 # target directories
 export PLAT_DIR=linux$(BIT_VARIANT)/$(BUILD_VARIANT)
-export LIB_TARGET_DIR=$(RCTDL_LIB_ROOT)/$(PLAT_DIR)
-export LIB_TEST_TARGET_DIR=$(RCTDL_TESTS)/lib/$(PLAT_DIR)
-export BIN_TEST_TARGET_DIR=$(RCTDL_TESTS)/bin/$(PLAT_DIR)
+export LIB_TARGET_DIR=$(OCSD_LIB_ROOT)/$(PLAT_DIR)
+export LIB_TEST_TARGET_DIR=$(OCSD_TESTS)/lib/$(PLAT_DIR)
+export BIN_TEST_TARGET_DIR=$(OCSD_TESTS)/bin/$(PLAT_DIR)
 
 ###########################################################
 # build targets
@@ -119,7 +119,7 @@
 
 $(LIB_TARGET_DIR)/lib$(LIB_BASE_NAME).a:
 	mkdir -p $(LIB_TARGET_DIR)
-	cd $(RCTDL_ROOT)/build/linux/ref_trace_decode_lib && make
+	cd $(OCSD_ROOT)/build/linux/ref_trace_decode_lib && make
 
 
 ################################
@@ -129,7 +129,7 @@
 
 $(LIB_TARGET_DIR)/lib$(LIB_BASE_NAME).so:
 	mkdir -p $(LIB_TARGET_DIR)
-	cd $(RCTDL_ROOT)/build/linux/ref_trace_decode_lib && make
+	cd $(OCSD_ROOT)/build/linux/ref_trace_decode_lib && make
 
 ################################
 # build static OpenCSD trace decode C API library 
@@ -138,7 +138,7 @@
 
 $(LIB_TARGET_DIR)/lib$(LIB_CAPI_NAME).a:
 	mkdir -p $(LIB_TARGET_DIR)
-	cd $(RCTDL_ROOT)/build/linux/rctdl_c_api_lib && make
+	cd $(OCSD_ROOT)/build/linux/rctdl_c_api_lib && make
 
 ################################
 # build shared OpenCSD trace decode C API library 
@@ -147,7 +147,7 @@
 
 $(LIB_TARGET_DIR)/lib$(LIB_CAPI_NAME).so: $(LIB_BASE_NAME)_lib
 	mkdir -p $(LIB_TARGET_DIR)
-	cd $(RCTDL_ROOT)/build/linux/rctdl_c_api_lib && make
+	cd $(OCSD_ROOT)/build/linux/rctdl_c_api_lib && make
 
 
 #################################
@@ -155,9 +155,9 @@
 
 .PHONY: tests
 tests: libs
-	cd $(RCTDL_ROOT)/tests/build/linux/snapshot_parser_lib && make
-	cd $(RCTDL_ROOT)/tests/build/linux/trc_pkt_lister && make
-	cd $(RCTDL_ROOT)/tests/build/linux/simple_pkt_print_c_api && make
+	cd $(OCSD_ROOT)/tests/build/linux/snapshot_parser_lib && make
+	cd $(OCSD_ROOT)/tests/build/linux/trc_pkt_lister && make
+	cd $(OCSD_ROOT)/tests/build/linux/simple_pkt_print_c_api && make
 
 #############################################################
 # clean targets
@@ -167,10 +167,10 @@
 .PHONY: clean_libs clean_tests
 
 clean_libs:
-	cd $(RCTDL_ROOT)/build/linux/ref_trace_decode_lib && make clean
-	cd $(RCTDL_ROOT)/build/linux/rctdl_c_api_lib && make clean
+	cd $(OCSD_ROOT)/build/linux/ref_trace_decode_lib && make clean
+	cd $(OCSD_ROOT)/build/linux/rctdl_c_api_lib && make clean
 
 clean_tests:
-	cd $(RCTDL_ROOT)/tests/build/linux/snapshot_parser_lib && make clean
-	cd $(RCTDL_ROOT)/tests/build/linux/trc_pkt_lister && make clean
-	cd $(RCTDL_ROOT)/tests/build/linux/simple_pkt_print_c_api && make clean
+	cd $(OCSD_ROOT)/tests/build/linux/snapshot_parser_lib && make clean
+	cd $(OCSD_ROOT)/tests/build/linux/trc_pkt_lister && make clean
+	cd $(OCSD_ROOT)/tests/build/linux/simple_pkt_print_c_api && make clean
diff --git a/decoder/build/linux/rctdl_c_api_lib/makefile b/decoder/build/linux/rctdl_c_api_lib/makefile
index 3c79eb8..9338bfa 100644
--- a/decoder/build/linux/rctdl_c_api_lib/makefile
+++ b/decoder/build/linux/rctdl_c_api_lib/makefile
@@ -43,13 +43,13 @@
 
 BUILD_DIR=./$(PLAT_DIR)
 
-VPATH=	$(RCTDL_SOURCE)/c_api
+VPATH=	$(OCSD_SOURCE)/c_api
 
 CPP_INCLUDES= \
-				-I$(RCTDL_INCLUDE) \
-				-I$(RCTDL_SOURCE)/c_api
+				-I$(OCSD_INCLUDE) \
+				-I$(OCSD_SOURCE)/c_api
 
-OBJECTS=$(BUILD_DIR)/rctdl_c_api.o
+OBJECTS=$(BUILD_DIR)/ocsd_c_api.o
 
 
 all: build_dir $(OBJECTS)
diff --git a/decoder/build/linux/ref_trace_decode_lib/makefile b/decoder/build/linux/ref_trace_decode_lib/makefile
index 4898e01..48e3357 100644
--- a/decoder/build/linux/ref_trace_decode_lib/makefile
+++ b/decoder/build/linux/ref_trace_decode_lib/makefile
@@ -42,18 +42,18 @@
 
 BUILD_DIR=./$(PLAT_DIR)
 
-VPATH=	$(RCTDL_SOURCE) \
-		$(RCTDL_SOURCE)/etmv3 \
-		$(RCTDL_SOURCE)/etmv4 \
-		$(RCTDL_SOURCE)/ptm \
-		$(RCTDL_SOURCE)/i_dec \
-		$(RCTDL_SOURCE)/mem_acc \
-		$(RCTDL_SOURCE)/stm
+VPATH=	$(OCSD_SOURCE) \
+		$(OCSD_SOURCE)/etmv3 \
+		$(OCSD_SOURCE)/etmv4 \
+		$(OCSD_SOURCE)/ptm \
+		$(OCSD_SOURCE)/i_dec \
+		$(OCSD_SOURCE)/mem_acc \
+		$(OCSD_SOURCE)/stm
 
 
 CPP_INCLUDES= \
-				-I$(RCTDL_INCLUDE) \
-				-I$(RCTDL_SOURCE)
+				-I$(OCSD_INCLUDE) \
+				-I$(OCSD_SOURCE)
 
 ETMV3OBJ=	$(BUILD_DIR)/trc_cmp_cfg_etmv3.o \
 			$(BUILD_DIR)/trc_pkt_elem_etmv3.o \
@@ -84,11 +84,11 @@
 STMOBJ=		$(BUILD_DIR)/trc_pkt_elem_stm.o \
 			$(BUILD_DIR)/trc_pkt_proc_stm.o
 
-OBJECTS=$(BUILD_DIR)/rctdl_dcd_tree.o \
-		$(BUILD_DIR)/rctdl_error.o \
-		$(BUILD_DIR)/rctdl_error_logger.o \
-		$(BUILD_DIR)/rctdl_msg_logger.o \
-		$(BUILD_DIR)/rctdl_version.o \
+OBJECTS=$(BUILD_DIR)/ocsd_dcd_tree.o \
+		$(BUILD_DIR)/ocsd_error.o \
+		$(BUILD_DIR)/ocsd_error_logger.o \
+		$(BUILD_DIR)/ocsd_msg_logger.o \
+		$(BUILD_DIR)/ocsd_version.o \
 		$(BUILD_DIR)/trc_component.o \
 		$(BUILD_DIR)/trc_core_arch_map.o \
 		$(BUILD_DIR)/trc_frame_deformatter.o \