diff --git a/DemoAndroid/tinkerbell_android.sublime-project b/DemoAndroid/tinkerbell_android.sublime-project
index 7de44eaf..461983ae 100644
--- a/DemoAndroid/tinkerbell_android.sublime-project
+++ b/DemoAndroid/tinkerbell_android.sublime-project
@@ -10,7 +10,7 @@
 			"path": "../Demo/renderers/"
 		},
 		{
-			"path": "../tinkerbell/",
+			"path": "../src/",
 			"folder_exclude_patterns": ["icon"],
 			"file_exclude_patterns": ["*.png"]
 		}
diff --git a/ide_extensions/VisualStudio/install.bat b/ide_extensions/VisualStudio/install.bat
index ad12d6ae..48a5173e 100644
--- a/ide_extensions/VisualStudio/install.bat
+++ b/ide_extensions/VisualStudio/install.bat
@@ -4,4 +4,4 @@
 REM set the current directory to where the bat file is
 cd /d %~dp0
 
-copy tinkerbell.natvis "%USERPROFILE%\Documents\Visual Studio 11\Visualizers\"
+copy turbobadger.natvis "%USERPROFILE%\Documents\Visual Studio 11\Visualizers\"
diff --git a/ide_extensions/VisualStudio/tinkerbell.natvis b/ide_extensions/VisualStudio/turbobadger.natvis
similarity index 73%
rename from ide_extensions/VisualStudio/tinkerbell.natvis
rename to ide_extensions/VisualStudio/turbobadger.natvis
index 9bc8e74f..d1cb60b2 100644
--- a/ide_extensions/VisualStudio/tinkerbell.natvis
+++ b/ide_extensions/VisualStudio/turbobadger.natvis
@@ -1,35 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
-	<Type Name="tinkerbell::TBStr">
+	<Type Name="tb::TBStr">
 		<DisplayString>{s}</DisplayString>
-		<StringView>s</StringView> 
+		<StringView>s</StringView>
 	</Type>
-	<Type Name="tinkerbell::TBRect">
+	<Type Name="tb::TBRect">
 		<DisplayString>{{x={x} y={y} w={w} h={h}}}</DisplayString>
 	</Type>
-	<Type Name="tinkerbell::TBID_not_needed_sdfasdfa">
-		<DisplayString>{id} ({debug_string.s})</DisplayString>
-	</Type>
-	<Type Name="tinkerbell::TBFontDescription">
+	<Type Name="tb::TBFontDescription">
 		<DisplayString Condition="m_id.id == 0 &amp;&amp; m_packed_init == 0">Unspecified font (inherit)</DisplayString>
 		<DisplayString Condition="m_id.id == 0">Test dummy font, size: {m_packed.size}</DisplayString>
 		<DisplayString>{m_id.debug_string.s}, size: {m_packed.size}</DisplayString>
 	</Type>
-	<Type Name="tinkerbell::TBValue">
+	<Type Name="tb::TBValue">
 		<DisplayString Condition="m_packed.type == 0">NULL</DisplayString>
 		<DisplayString Condition="m_packed.type == 1">{val_str}</DisplayString>
 		<DisplayString Condition="m_packed.type == 2">{val_float}</DisplayString>
 		<DisplayString Condition="m_packed.type == 3">{val_int}</DisplayString>
 		<DisplayString Condition="m_packed.type == 4">array {val_arr}</DisplayString>
 	</Type>
-	<Type Name="tinkerbell::TBValueArray">
+	<Type Name="tb::TBValueArray">
 		<DisplayString>{m_list}</DisplayString>
 	</Type>
-	<Type Name="tinkerbell::TBListBackend">
+	<Type Name="tb::TBListBackend">
 		<DisplayString Condition="m_data != 0">length = {m_data->num}</DisplayString>
 		<DisplayString>length = 0</DisplayString>
 	</Type>
-	<Type Name="tinkerbell::TBWidgetEvent">
+	<Type Name="tb::TBWidgetEvent">
 		<DisplayString>type={type}</DisplayString>
 	</Type>
 </AutoVisualizer>
diff --git a/src/tb/tb_font_renderer_tbbf.cpp b/src/tb/tb_font_renderer_tbbf.cpp
index 7f008e53..1c19b223 100644
--- a/src/tb/tb_font_renderer_tbbf.cpp
+++ b/src/tb/tb_font_renderer_tbbf.cpp
@@ -22,7 +22,7 @@ struct GLYPH {
 	glyphs for a given size. The number of glyphs that the font contains is
 	defined by the glyph string defined in the text file.
 
-	Text file format (in tb.txt format parsed by tinkerbell/parser/tb_parser.h):
+	Text file format (in tb.txt format parsed by parser/tb_parser.h):
 
 		- info>glyph_str			Should specify which characters the image
 								file contains.
diff --git a/tinkerbell.sublime-project b/tinkerbell.sublime-project
deleted file mode 100644
index 05beca08..00000000
--- a/tinkerbell.sublime-project
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"folders":
-	[
-		{
-			"path": "./",
-			"folder_exclude_patterns": ["VisualStudio"],
-			"file_exclude_patterns": ["*~", "RunDemo", "*.png", "*.o.d"]
-		}
-	],
-	"settings":
-	{
-		"tab_size": 4,
-		"trim_trailing_white_space_on_save": true,
-
-		// Settings for SublimeGDB
-		"sublimegdb_commandline": "gdb --interpreter=mi ./RunDemo",
-		"sublimegdb_workingdir": "${folder:${project_path:RunDemo}}"
-	},
-	"build_systems":
-	[
-		{
-			"name": "Make DEBUG=YES",
-			"working_dir": "${project_path:${folder}}",
-			"cmd": ["make", "DEBUG=YES"]
-		}
-	]
-}
diff --git a/turbobadger.sublime-project b/turbobadger.sublime-project
new file mode 100644
index 00000000..4327336a
--- /dev/null
+++ b/turbobadger.sublime-project
@@ -0,0 +1,39 @@
+{
+	"build_systems":
+	[
+		{
+			"cmd":
+			[
+				"make",
+				"DEBUG=YES"
+			],
+			"name": "Make DEBUG=YES",
+			"working_dir": "${project_path:${folder}}"
+		}
+	],
+	"folders":
+	[
+		{
+			"file_exclude_patterns":
+			[
+				"*~",
+				"RunDemo",
+				"*.png",
+				"*.o.d"
+			],
+			"folder_exclude_patterns":
+			[
+				"VisualStudio"
+			],
+			"follow_symlinks": true,
+			"path": "."
+		}
+	],
+	"settings":
+	{
+		"sublimegdb_commandline": "gdb --interpreter=mi ./RunDemo",
+		"sublimegdb_workingdir": "${folder:${project_path:RunDemo}}",
+		"tab_size": 4,
+		"trim_trailing_white_space_on_save": true
+	}
+}