diff --git a/Kernel.sln b/Kernel.sln
index 857281436..b148b8fab 100644
--- a/Kernel.sln
+++ b/Kernel.sln
@@ -96,6 +96,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GuessKernelGen3", "source\K
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TempCompileTest", "source\Kernel-X86\TempCompileTest\TempCompileTest.csproj", "{6B6EB060-C878-4C50-88BC-79128CA75F95}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TRKernel", "source\Kernel-TapRoot\Demo\TRKernel.csproj", "{F614D199-03E6-4CBD-836C-EDB769B025A3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -351,6 +353,14 @@ Global
 		{6B6EB060-C878-4C50-88BC-79128CA75F95}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6B6EB060-C878-4C50-88BC-79128CA75F95}.Release|x86.ActiveCfg = Release|Any CPU
 		{6B6EB060-C878-4C50-88BC-79128CA75F95}.Release|x86.Build.0 = Release|Any CPU
+		{F614D199-03E6-4CBD-836C-EDB769B025A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F614D199-03E6-4CBD-836C-EDB769B025A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F614D199-03E6-4CBD-836C-EDB769B025A3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F614D199-03E6-4CBD-836C-EDB769B025A3}.Debug|x86.Build.0 = Debug|Any CPU
+		{F614D199-03E6-4CBD-836C-EDB769B025A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F614D199-03E6-4CBD-836C-EDB769B025A3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F614D199-03E6-4CBD-836C-EDB769B025A3}.Release|x86.ActiveCfg = Release|Any CPU
+		{F614D199-03E6-4CBD-836C-EDB769B025A3}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -396,5 +406,6 @@ Global
 		{B22ED069-6DA3-43A8-A7E8-FD0B8F74EC3B} = {DB771C12-E60D-41C9-9A39-74CC95A661CD}
 		{9E58E949-7B71-45ED-9610-11DA287EE933} = {2A22DC4C-E237-4D4B-A592-47D477F9ED5B}
 		{6B6EB060-C878-4C50-88BC-79128CA75F95} = {00F0CA9C-51B2-4E99-B4D9-DD24D488D3FC}
+		{F614D199-03E6-4CBD-836C-EDB769B025A3} = {DB771C12-E60D-41C9-9A39-74CC95A661CD}
 	EndGlobalSection
 EndGlobal
diff --git a/source/Kernel-TapRoot/Demo/Boot.cs b/source/Kernel-TapRoot/Demo/Boot.cs
index 55a59ccf1..383da1c7f 100644
--- a/source/Kernel-TapRoot/Demo/Boot.cs
+++ b/source/Kernel-TapRoot/Demo/Boot.cs
@@ -1,16 +1,8 @@
 using System;
-using Sys = Cosmos.System;
 
  // Beware Demo Kernels are not recompiled when its dependencies changes!
  // To force recompilation right click on on the Cosmos icon of the demo solution and do "Build".
-namespace KernelGen3 {
-    public class Boot : Sys.Boot {
-
-        protected override void Run() {
-            Cosmos.CPU.Temp.ShowText();
-
-            while (true) {
-            }
-        }
+namespace TRKernel {
+    public class Boot {
     }
 }
diff --git a/source/Kernel-TapRoot/Demo/TR-Boot.Cosmos b/source/Kernel-TapRoot/Demo/TRBoot.Cosmos
similarity index 100%
rename from source/Kernel-TapRoot/Demo/TR-Boot.Cosmos
rename to source/Kernel-TapRoot/Demo/TRBoot.Cosmos
diff --git a/source/Kernel-TapRoot/Demo/TR-Kernel.csproj b/source/Kernel-TapRoot/Demo/TRKernel.csproj
similarity index 85%
rename from source/Kernel-TapRoot/Demo/TR-Kernel.csproj
rename to source/Kernel-TapRoot/Demo/TRKernel.csproj
index 15f886d98..1a64d82b3 100644
--- a/source/Kernel-TapRoot/Demo/TR-Kernel.csproj
+++ b/source/Kernel-TapRoot/Demo/TRKernel.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard1.5</TargetFramework>
-    <ProjectGuid>{9E58E949-7B71-45ED-9610-11DA287EE933}</ProjectGuid>
+    <ProjectGuid>f614d199-03e6-4cbd-836c-edb769b025a3</ProjectGuid>
   </PropertyGroup>
 
   <ItemGroup>