diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/FreeRTOSConfig.h b/Demo/CORTEX_LM3Sxxxx_Rowley/FreeRTOSConfig.h
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/FreeRTOSConfig.h
rename to Demo/CORTEX_LM3Sxxxx_Rowley/FreeRTOSConfig.h
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/IntQueueTimer.c b/Demo/CORTEX_LM3Sxxxx_Rowley/IntQueueTimer.c
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/IntQueueTimer.c
rename to Demo/CORTEX_LM3Sxxxx_Rowley/IntQueueTimer.c
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/IntQueueTimer.h b/Demo/CORTEX_LM3Sxxxx_Rowley/IntQueueTimer.h
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/IntQueueTimer.h
rename to Demo/CORTEX_LM3Sxxxx_Rowley/IntQueueTimer.h
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/LM3S_Startup.s b/Demo/CORTEX_LM3Sxxxx_Rowley/LM3S_Startup.s
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/LM3S_Startup.s
rename to Demo/CORTEX_LM3Sxxxx_Rowley/LM3S_Startup.s
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/LM3S_Target.js b/Demo/CORTEX_LM3Sxxxx_Rowley/LM3S_Target.js
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/LM3S_Target.js
rename to Demo/CORTEX_LM3Sxxxx_Rowley/LM3S_Target.js
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/ParTest/ParTest.c b/Demo/CORTEX_LM3Sxxxx_Rowley/ParTest/ParTest.c
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/ParTest/ParTest.c
rename to Demo/CORTEX_LM3Sxxxx_Rowley/ParTest/ParTest.c
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/RTOSDemo.hzp b/Demo/CORTEX_LM3Sxxxx_Rowley/RTOSDemo.hzp
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/RTOSDemo.hzp
rename to Demo/CORTEX_LM3Sxxxx_Rowley/RTOSDemo.hzp
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/RTOSDemo.hzs b/Demo/CORTEX_LM3Sxxxx_Rowley/RTOSDemo.hzs
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/RTOSDemo.hzs
rename to Demo/CORTEX_LM3Sxxxx_Rowley/RTOSDemo.hzs
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/bitmap.h b/Demo/CORTEX_LM3Sxxxx_Rowley/bitmap.h
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/bitmap.h
rename to Demo/CORTEX_LM3Sxxxx_Rowley/bitmap.h
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/formike128x128x16.c b/Demo/CORTEX_LM3Sxxxx_Rowley/formike128x128x16.c
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/formike128x128x16.c
rename to Demo/CORTEX_LM3Sxxxx_Rowley/formike128x128x16.c
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/formike128x128x16.h b/Demo/CORTEX_LM3Sxxxx_Rowley/formike128x128x16.h
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/formike128x128x16.h
rename to Demo/CORTEX_LM3Sxxxx_Rowley/formike128x128x16.h
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/lcd_message.h b/Demo/CORTEX_LM3Sxxxx_Rowley/lcd_message.h
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/lcd_message.h
rename to Demo/CORTEX_LM3Sxxxx_Rowley/lcd_message.h
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/main.c b/Demo/CORTEX_LM3Sxxxx_Rowley/main.c
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/main.c
rename to Demo/CORTEX_LM3Sxxxx_Rowley/main.c
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/osram128x64x4.c b/Demo/CORTEX_LM3Sxxxx_Rowley/osram128x64x4.c
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/osram128x64x4.c
rename to Demo/CORTEX_LM3Sxxxx_Rowley/osram128x64x4.c
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/osram128x64x4.h b/Demo/CORTEX_LM3Sxxxx_Rowley/osram128x64x4.h
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/osram128x64x4.h
rename to Demo/CORTEX_LM3Sxxxx_Rowley/osram128x64x4.h
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/pack_struct_end.h b/Demo/CORTEX_LM3Sxxxx_Rowley/pack_struct_end.h
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/pack_struct_end.h
rename to Demo/CORTEX_LM3Sxxxx_Rowley/pack_struct_end.h
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/pack_struct_start.h b/Demo/CORTEX_LM3Sxxxx_Rowley/pack_struct_start.h
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/pack_struct_start.h
rename to Demo/CORTEX_LM3Sxxxx_Rowley/pack_struct_start.h
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/rit128x96x4.c b/Demo/CORTEX_LM3Sxxxx_Rowley/rit128x96x4.c
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/rit128x96x4.c
rename to Demo/CORTEX_LM3Sxxxx_Rowley/rit128x96x4.c
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/thumb_crt0.s b/Demo/CORTEX_LM3Sxxxx_Rowley/thumb_crt0.s
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/thumb_crt0.s
rename to Demo/CORTEX_LM3Sxxxx_Rowley/thumb_crt0.s
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/timertest.c b/Demo/CORTEX_LM3Sxxxx_Rowley/timertest.c
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/timertest.c
rename to Demo/CORTEX_LM3Sxxxx_Rowley/timertest.c
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/Makefile.webserver b/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/Makefile.webserver
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/Makefile.webserver
rename to Demo/CORTEX_LM3Sxxxx_Rowley/webserver/Makefile.webserver
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/clock-arch.h b/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/clock-arch.h
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/clock-arch.h
rename to Demo/CORTEX_LM3Sxxxx_Rowley/webserver/clock-arch.h
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/emac.c b/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/emac.c
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/emac.c
rename to Demo/CORTEX_LM3Sxxxx_Rowley/webserver/emac.c
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/emac.h b/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/emac.h
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/emac.h
rename to Demo/CORTEX_LM3Sxxxx_Rowley/webserver/emac.h
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/http-strings b/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/http-strings
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/http-strings
rename to Demo/CORTEX_LM3Sxxxx_Rowley/webserver/http-strings
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/http-strings.c b/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/http-strings.c
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/http-strings.c
rename to Demo/CORTEX_LM3Sxxxx_Rowley/webserver/http-strings.c
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/http-strings.h b/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/http-strings.h
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/http-strings.h
rename to Demo/CORTEX_LM3Sxxxx_Rowley/webserver/http-strings.h
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/httpd-cgi.c b/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/httpd-cgi.c
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/httpd-cgi.c
rename to Demo/CORTEX_LM3Sxxxx_Rowley/webserver/httpd-cgi.c
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/httpd-cgi.h b/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/httpd-cgi.h
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/httpd-cgi.h
rename to Demo/CORTEX_LM3Sxxxx_Rowley/webserver/httpd-cgi.h
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/httpd-fs.c b/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/httpd-fs.c
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/httpd-fs.c
rename to Demo/CORTEX_LM3Sxxxx_Rowley/webserver/httpd-fs.c
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/httpd-fs.h b/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/httpd-fs.h
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/httpd-fs.h
rename to Demo/CORTEX_LM3Sxxxx_Rowley/webserver/httpd-fs.h
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/httpd-fs/404.html b/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/httpd-fs/404.html
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/httpd-fs/404.html
rename to Demo/CORTEX_LM3Sxxxx_Rowley/webserver/httpd-fs/404.html
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/httpd-fs/index.html b/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/httpd-fs/index.html
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/httpd-fs/index.html
rename to Demo/CORTEX_LM3Sxxxx_Rowley/webserver/httpd-fs/index.html
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/httpd-fs/index.shtml b/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/httpd-fs/index.shtml
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/httpd-fs/index.shtml
rename to Demo/CORTEX_LM3Sxxxx_Rowley/webserver/httpd-fs/index.shtml
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/httpd-fs/io.shtml b/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/httpd-fs/io.shtml
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/httpd-fs/io.shtml
rename to Demo/CORTEX_LM3Sxxxx_Rowley/webserver/httpd-fs/io.shtml
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/httpd-fs/runtime.shtml b/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/httpd-fs/runtime.shtml
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/httpd-fs/runtime.shtml
rename to Demo/CORTEX_LM3Sxxxx_Rowley/webserver/httpd-fs/runtime.shtml
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/httpd-fs/stats.shtml b/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/httpd-fs/stats.shtml
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/httpd-fs/stats.shtml
rename to Demo/CORTEX_LM3Sxxxx_Rowley/webserver/httpd-fs/stats.shtml
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/httpd-fs/tcp.shtml b/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/httpd-fs/tcp.shtml
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/httpd-fs/tcp.shtml
rename to Demo/CORTEX_LM3Sxxxx_Rowley/webserver/httpd-fs/tcp.shtml
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/httpd-fsdata.c b/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/httpd-fsdata.c
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/httpd-fsdata.c
rename to Demo/CORTEX_LM3Sxxxx_Rowley/webserver/httpd-fsdata.c
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/httpd-fsdata.h b/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/httpd-fsdata.h
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/httpd-fsdata.h
rename to Demo/CORTEX_LM3Sxxxx_Rowley/webserver/httpd-fsdata.h
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/httpd.c b/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/httpd.c
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/httpd.c
rename to Demo/CORTEX_LM3Sxxxx_Rowley/webserver/httpd.c
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/httpd.h b/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/httpd.h
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/httpd.h
rename to Demo/CORTEX_LM3Sxxxx_Rowley/webserver/httpd.h
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/makefsdata b/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/makefsdata
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/makefsdata
rename to Demo/CORTEX_LM3Sxxxx_Rowley/webserver/makefsdata
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/makestrings b/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/makestrings
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/makestrings
rename to Demo/CORTEX_LM3Sxxxx_Rowley/webserver/makestrings
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/uIP_Task.c b/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/uIP_Task.c
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/uIP_Task.c
rename to Demo/CORTEX_LM3Sxxxx_Rowley/webserver/uIP_Task.c
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/uip-conf.h b/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/uip-conf.h
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/uip-conf.h
rename to Demo/CORTEX_LM3Sxxxx_Rowley/webserver/uip-conf.h
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/webserver.h b/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/webserver.h
similarity index 100%
rename from Demo/CORTEX_MPU_LM3Sxxxx_Rowley/webserver/webserver.h
rename to Demo/CORTEX_LM3Sxxxx_Rowley/webserver/webserver.h
diff --git a/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/main.c b/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/main.c
index 629f9a1275..b2eaf780aa 100644
--- a/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/main.c
+++ b/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/main.c
@@ -97,7 +97,7 @@
 
 /*-----------------------------------------------------------*/
 
-#error The batch file Demo\NiosII_CycloneIII_DBC3C40_GCC\CreateProjectDirectoryStructure.bat must be executed before the first build.  After executing the batch file hit F5 to refrech the Eclipse project, then delete this line.
+#error The batch file Demo\NiosII_CycloneIII_DBC3C40_GCC\CreateProjectDirectoryStructure.bat must be executed before the project is imported into the workspace.  Failure to do this will result in the include paths stored in the project being deleted.  Remove this line after CreateProjectDirectoryStructure.bat has been executed.
 
 /*-----------------------------------------------------------*/