13 files changed, 12 insertions, 12 deletions
diff --git a/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/Makefile b/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/Makefile
index 9c2e46520..87ddba648 100644
--- a/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/Makefile
+++ b/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/Makefile
@@ -99,7 +99,7 @@ include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
 # Other files (optional).
 include $(CHIBIOS)/test/rt/test.mk
-include $(CHIBIOS)/os/common/abstractions/nasa-osal/nasa-osal.mk
+include $(CHIBIOS)/os/common/abstractions/nasa_osal/nasa_osal.mk
 
 # Define linker script file here
 LDSCRIPT= $(STARTUPLD)/STM32F407xG.ld
diff --git a/os/common/abstractions/nasa-osal/nasa-osal.mk b/os/common/abstractions/nasa-osal/nasa-osal.mk
deleted file mode 100644
index 9562970a0..000000000
--- a/os/common/abstractions/nasa-osal/nasa-osal.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# NASAOSAL files.
-NASAOSALSRC = $(CHIBIOS)/os/common/abstractions/nasa-osal/src/osapi.c
-
-NASAOSALINC = $(CHIBIOS)/os/common/abstractions/nasa-osal/include
diff --git a/os/common/abstractions/nasa-osal/include/common_types.h b/os/common/abstractions/nasa_osal/include/common_types.h
index 100a9c72e..100a9c72e 100644
--- a/os/common/abstractions/nasa-osal/include/common_types.h
+++ b/os/common/abstractions/nasa_osal/include/common_types.h
diff --git a/os/common/abstractions/nasa-osal/include/osapi-os-core.h b/os/common/abstractions/nasa_osal/include/osapi-os-core.h
index 8c9b13a78..8c9b13a78 100644
--- a/os/common/abstractions/nasa-osal/include/osapi-os-core.h
+++ b/os/common/abstractions/nasa_osal/include/osapi-os-core.h
diff --git a/os/common/abstractions/nasa-osal/include/osapi-os-filesys.h b/os/common/abstractions/nasa_osal/include/osapi-os-filesys.h
index c46800341..c46800341 100644
--- a/os/common/abstractions/nasa-osal/include/osapi-os-filesys.h
+++ b/os/common/abstractions/nasa_osal/include/osapi-os-filesys.h
diff --git a/os/common/abstractions/nasa-osal/include/osapi-os-loader.h b/os/common/abstractions/nasa_osal/include/osapi-os-loader.h
index 4f0b21b62..4f0b21b62 100644
--- a/os/common/abstractions/nasa-osal/include/osapi-os-loader.h
+++ b/os/common/abstractions/nasa_osal/include/osapi-os-loader.h
diff --git a/os/common/abstractions/nasa-osal/include/osapi-os-net.h b/os/common/abstractions/nasa_osal/include/osapi-os-net.h
index b8cc67d69..b8cc67d69 100644
--- a/os/common/abstractions/nasa-osal/include/osapi-os-net.h
+++ b/os/common/abstractions/nasa_osal/include/osapi-os-net.h
diff --git a/os/common/abstractions/nasa-osal/include/osapi-os-timer.h b/os/common/abstractions/nasa_osal/include/osapi-os-timer.h
index 8082c6227..8082c6227 100644
--- a/os/common/abstractions/nasa-osal/include/osapi-os-timer.h
+++ b/os/common/abstractions/nasa_osal/include/osapi-os-timer.h
diff --git a/os/common/abstractions/nasa-osal/include/osapi-version.h b/os/common/abstractions/nasa_osal/include/osapi-version.h
index 331e96c94..331e96c94 100644
--- a/os/common/abstractions/nasa-osal/include/osapi-version.h
+++ b/os/common/abstractions/nasa_osal/include/osapi-version.h
diff --git a/os/common/abstractions/nasa-osal/include/osapi.h b/os/common/abstractions/nasa_osal/include/osapi.h
index 46f6dc031..46f6dc031 100644
--- a/os/common/abstractions/nasa-osal/include/osapi.h
+++ b/os/common/abstractions/nasa_osal/include/osapi.h
diff --git a/os/common/abstractions/nasa_osal/nasa_osal.mk b/os/common/abstractions/nasa_osal/nasa_osal.mk
new file mode 100644
index 000000000..8b8ef9daa
--- /dev/null
+++ b/os/common/abstractions/nasa_osal/nasa_osal.mk
@@ -0,0 +1,4 @@
+# NASAOSAL files.
+NASAOSALSRC = $(CHIBIOS)/os/common/abstractions/nasa_osal/src/osapi.c
+
+NASAOSALINC = $(CHIBIOS)/os/common/abstractions/nasa_osal/include
diff --git a/os/common/abstractions/nasa-osal/src/osapi.c b/os/common/abstractions/nasa_osal/src/osapi.c
index b69caea62..b69caea62 100644
--- a/os/common/abstractions/nasa-osal/src/osapi.c
+++ b/os/common/abstractions/nasa_osal/src/osapi.c
diff --git a/readme.txt b/readme.txt
index fffcd622e..1683d56e3 100644
--- a/readme.txt
+++ b/readme.txt
@@ -34,14 +34,14 @@
   |  |  +--index.html     - Local documentation access (after rebuild).
   +--ext/                 - External libraries, not part of ChibiOS/RT.
   +--os/                  - ChibiOS components.
-  |  +--abstractions/     - API emulator wrappers.
-  |  |  +--cmsis-os       - CMSIS OS emulation layer for RT (ARMCMx port only).
-  |  |  +--nasa-osal      - NASA Operating System Abstraction Layer for RT.
   |  +--common/           - Shared OS modules.
-  |  +--common/ext/       - Vendor files used by the OS.
-  |  +--common/oslib/     - RTOS modules usable by both RT and NIL.
-  |  +--common/ports/     - RTOS ports usable by both RT and NIL.
-  |  +--common/startup/   - Startup support for all compilers and platforms.
+  |  |  +--abstractions/  - API emulator wrappers.
+  |  |  |  +--cmsis_os/   - CMSIS OS emulation layer for RT (ARMCMx port only).
+  |  |  |  +--nasa_osal/  - NASA Operating System Abstraction Layer for RT.
+  |  |  +--ext/           - Vendor files used by the OS.
+  |  |  +--oslib/         - RTOS modules usable by both RT and NIL.
+  |  |  +--ports/         - RTOS ports usable by both RT and NIL.
+  |  |  +--startup/       - Startup support for all compilers and platforms.
   |  +--hal/              - HAL component.
   |  |  +--boards/        - HAL board support files.
   |  |  +--dox/           - HAL documentation resources.