diff --git a/.cproject b/.cproject
index 608051f..1f4904f 100644
--- a/.cproject
+++ b/.cproject
@@ -96,7 +96,7 @@
 							<builder buildPath="${workspace_loc:/scv_tr_sqlite}/Release" id="cdt.managedbuild.target.gnu.builder.macosx.exe.release.1921784777" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.macosx.exe.release"/>
 							<tool id="cdt.managedbuild.tool.macosx.c.linker.macosx.exe.release.835264205" name="MacOS X C Linker" superClass="cdt.managedbuild.tool.macosx.c.linker.macosx.exe.release"/>
 							<tool id="cdt.managedbuild.tool.macosx.cpp.linker.macosx.exe.release.807087528" name="MacOS X C++ Linker" superClass="cdt.managedbuild.tool.macosx.cpp.linker.macosx.exe.release">
-								<option id="macosx.cpp.link.option.paths.1094947030" name="Library search path (-L)" superClass="macosx.cpp.link.option.paths" valueType="libPaths">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="macosx.cpp.link.option.paths.1094947030" name="Library search path (-L)" superClass="macosx.cpp.link.option.paths" valueType="libPaths">
 									<listOptionValue builtIn="false" value="/projects/tools/SystemC/opt/lib-linux64"/>
 								</option>
 								<inputType id="cdt.managedbuild.tool.macosx.cpp.linker.input.1729026262" superClass="cdt.managedbuild.tool.macosx.cpp.linker.input">
@@ -105,7 +105,7 @@
 								</inputType>
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.assembler.macosx.exe.release.960768765" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.macosx.exe.release">
-								<option id="gnu.both.asm.option.include.paths.1211035001" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.both.asm.option.include.paths.1211035001" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="/usr/include"/>
 									<listOptionValue builtIn="false" value="/usr/local/systemc2.3.1a/include/"/>
 								</option>
@@ -115,7 +115,7 @@
 							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.exe.release.1207281858" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.exe.release">
 								<option id="gnu.cpp.compiler.macosx.exe.release.option.optimization.level.1947685650" name="Optimization Level" superClass="gnu.cpp.compiler.macosx.exe.release.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
 								<option id="gnu.cpp.compiler.macosx.exe.release.option.debugging.level.1098045969" name="Debug Level" superClass="gnu.cpp.compiler.macosx.exe.release.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
-								<option id="gnu.cpp.compiler.option.include.paths.2920067" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.2920067" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="/projects/tools/SystemC/opt/include"/>
 									<listOptionValue builtIn="false" value="/usr/include"/>
 									<listOptionValue builtIn="false" value="&quot;${SYSTEMC_HOME}/include&quot;"/>
@@ -125,7 +125,7 @@
 							<tool id="cdt.managedbuild.tool.gnu.c.compiler.macosx.exe.release.2136924185" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.macosx.exe.release">
 								<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.macosx.exe.release.option.optimization.level.713312654" name="Optimization Level" superClass="gnu.c.compiler.macosx.exe.release.option.optimization.level" useByScannerDiscovery="false" valueType="enumerated"/>
 								<option id="gnu.c.compiler.macosx.exe.release.option.debugging.level.1629703352" name="Debug Level" superClass="gnu.c.compiler.macosx.exe.release.option.debugging.level" useByScannerDiscovery="false" value="gnu.c.debugging.level.none" valueType="enumerated"/>
-								<option id="gnu.c.compiler.option.include.paths.1878457622" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.c.compiler.option.include.paths.1878457622" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="/usr/include"/>
 									<listOptionValue builtIn="false" value="&quot;${SYSTEMC_HOME}/include&quot;"/>
 								</option>
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 0b528c0..af5419e 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -38,4 +38,4 @@ endif(SCV_FOUND)
 
 add_subdirectory(simple_system)
 add_subdirectory(transaction_recording)
-add_subdirectory(ahb_bfm_test)
+add_subdirectory(ahb_bfm)
diff --git a/examples/ahb_bfm_test/CMakeLists.txt b/examples/ahb_bfm/CMakeLists.txt
similarity index 80%
rename from examples/ahb_bfm_test/CMakeLists.txt
rename to examples/ahb_bfm/CMakeLists.txt
index 633cf20..88306ee 100644
--- a/examples/ahb_bfm_test/CMakeLists.txt
+++ b/examples/ahb_bfm/CMakeLists.txt
@@ -1,10 +1,10 @@
 cmake_minimum_required(VERSION 3.3)
 # Add executable called "transaction_recording" that is built from the source files
 # "scv_tr_recording_example.cpp". The extensions are automatically found.
-add_executable (ahb_bfm_test
+add_executable (ahb_bfm
 	sc_main.cpp
 )
 # Link the executable to the sc_components library. Since the sc_components library has
 # public include directories we will use those link directories when building
 # transaction_recording
-target_link_libraries (ahb_bfm_test LINK_PUBLIC scc ${CONAN_LIBS})
+target_link_libraries (ahb_bfm LINK_PUBLIC scc ${CONAN_LIBS})
diff --git a/examples/ahb_bfm_test/sc_main.cpp b/examples/ahb_bfm/sc_main.cpp
similarity index 97%
rename from examples/ahb_bfm_test/sc_main.cpp
rename to examples/ahb_bfm/sc_main.cpp
index 076156e..f325ad9 100644
--- a/examples/ahb_bfm_test/sc_main.cpp
+++ b/examples/ahb_bfm/sc_main.cpp
@@ -123,10 +123,10 @@ int sc_main (int argc , char *argv[]){
     ///////////////////////////////////////////////////////////////////////////
     scc::init_logging(logging::DEBUG);
     ///////////////////////////////////////////////////////////////////////////
-    // set up configuration
+    // set up configuration and tracing
     ///////////////////////////////////////////////////////////////////////////
-    scc::configurer cfg("ahb_test.json");
-    scc::configurable_tracer trace("ahb_test", tracer::TEXT, true, true);
+    scc::configurer cfg("ahb_bfm.json");
+    scc::configurable_tracer trace("ahb_bfm", tracer::TEXT, true, true);
     ///////////////////////////////////////////////////////////////////////////
     // create modules/channels and trace
     ///////////////////////////////////////////////////////////////////////////