diff --git a/os/common/abstractions/nasa_cfe/cfe_osal/cfe_osal.mk b/os/common/abstractions/nasa_cfe/osal/cfe_osal.mk
similarity index 100%
rename from os/common/abstractions/nasa_cfe/cfe_osal/cfe_osal.mk
rename to os/common/abstractions/nasa_cfe/osal/cfe_osal.mk
diff --git a/os/common/abstractions/nasa_cfe/cfe_osal/include/common_types.h b/os/common/abstractions/nasa_cfe/osal/include/common_types.h
similarity index 100%
rename from os/common/abstractions/nasa_cfe/cfe_osal/include/common_types.h
rename to os/common/abstractions/nasa_cfe/osal/include/common_types.h
diff --git a/os/common/abstractions/nasa_cfe/cfe_osal/include/osapi-os-core.h b/os/common/abstractions/nasa_cfe/osal/include/osapi-os-core.h
similarity index 100%
rename from os/common/abstractions/nasa_cfe/cfe_osal/include/osapi-os-core.h
rename to os/common/abstractions/nasa_cfe/osal/include/osapi-os-core.h
diff --git a/os/common/abstractions/nasa_cfe/cfe_osal/include/osapi-os-custom.h b/os/common/abstractions/nasa_cfe/osal/include/osapi-os-custom.h
similarity index 100%
rename from os/common/abstractions/nasa_cfe/cfe_osal/include/osapi-os-custom.h
rename to os/common/abstractions/nasa_cfe/osal/include/osapi-os-custom.h
diff --git a/os/common/abstractions/nasa_cfe/cfe_osal/include/osapi-os-filesys.h b/os/common/abstractions/nasa_cfe/osal/include/osapi-os-filesys.h
similarity index 100%
rename from os/common/abstractions/nasa_cfe/cfe_osal/include/osapi-os-filesys.h
rename to os/common/abstractions/nasa_cfe/osal/include/osapi-os-filesys.h
diff --git a/os/common/abstractions/nasa_cfe/cfe_osal/include/osapi-os-loader.h b/os/common/abstractions/nasa_cfe/osal/include/osapi-os-loader.h
similarity index 100%
rename from os/common/abstractions/nasa_cfe/cfe_osal/include/osapi-os-loader.h
rename to os/common/abstractions/nasa_cfe/osal/include/osapi-os-loader.h
diff --git a/os/common/abstractions/nasa_cfe/cfe_osal/include/osapi-os-net.h b/os/common/abstractions/nasa_cfe/osal/include/osapi-os-net.h
similarity index 100%
rename from os/common/abstractions/nasa_cfe/cfe_osal/include/osapi-os-net.h
rename to os/common/abstractions/nasa_cfe/osal/include/osapi-os-net.h
diff --git a/os/common/abstractions/nasa_cfe/cfe_osal/include/osapi-os-timer.h b/os/common/abstractions/nasa_cfe/osal/include/osapi-os-timer.h
similarity index 100%
rename from os/common/abstractions/nasa_cfe/cfe_osal/include/osapi-os-timer.h
rename to os/common/abstractions/nasa_cfe/osal/include/osapi-os-timer.h
diff --git a/os/common/abstractions/nasa_cfe/cfe_osal/include/osapi-version.h b/os/common/abstractions/nasa_cfe/osal/include/osapi-version.h
similarity index 100%
rename from os/common/abstractions/nasa_cfe/cfe_osal/include/osapi-version.h
rename to os/common/abstractions/nasa_cfe/osal/include/osapi-version.h
diff --git a/os/common/abstractions/nasa_cfe/cfe_osal/include/osapi.h b/os/common/abstractions/nasa_cfe/osal/include/osapi.h
similarity index 100%
rename from os/common/abstractions/nasa_cfe/cfe_osal/include/osapi.h
rename to os/common/abstractions/nasa_cfe/osal/include/osapi.h
diff --git a/os/common/abstractions/nasa_cfe/cfe_osal/src/osapi.c b/os/common/abstractions/nasa_cfe/osal/src/osapi.c
similarity index 100%
rename from os/common/abstractions/nasa_cfe/cfe_osal/src/osapi.c
rename to os/common/abstractions/nasa_cfe/osal/src/osapi.c
diff --git a/os/common/abstractions/nasa_cfe/cfe_psp/cfe_psp.mk b/os/common/abstractions/nasa_cfe/psp/cfe_psp.mk
similarity index 100%
rename from os/common/abstractions/nasa_cfe/cfe_psp/cfe_psp.mk
rename to os/common/abstractions/nasa_cfe/psp/cfe_psp.mk
diff --git a/os/common/abstractions/nasa_cfe/cfe_psp/include/cfe_psp.h b/os/common/abstractions/nasa_cfe/psp/include/cfe_psp.h
similarity index 100%
rename from os/common/abstractions/nasa_cfe/cfe_psp/include/cfe_psp.h
rename to os/common/abstractions/nasa_cfe/psp/include/cfe_psp.h
diff --git a/os/common/abstractions/nasa_cfe/cfe_psp/src/cfe_psp_support.c b/os/common/abstractions/nasa_cfe/psp/src/cfe_psp_support.c
similarity index 100%
rename from os/common/abstractions/nasa_cfe/cfe_psp/src/cfe_psp_support.c
rename to os/common/abstractions/nasa_cfe/psp/src/cfe_psp_support.c
diff --git a/os/common/abstractions/nasa_cfe/cfe_psp/src/cfe_psp_timer.c b/os/common/abstractions/nasa_cfe/psp/src/cfe_psp_timer.c
similarity index 100%
rename from os/common/abstractions/nasa_cfe/cfe_psp/src/cfe_psp_timer.c
rename to os/common/abstractions/nasa_cfe/psp/src/cfe_psp_timer.c