diff --git a/arch/arm/src/tiva/Make.defs b/arch/arm/src/tiva/Make.defs
index a91ef674b5c..a8d8fc62a07 100644
--- a/arch/arm/src/tiva/Make.defs
+++ b/arch/arm/src/tiva/Make.defs
@@ -91,9 +91,9 @@ CHIP_CSRCS += tiva_dumpgpio.c
 endif
 
 ifeq ($(CONFIG_ARCH_CHIP_TM4C129),y)
-CHIP_CSRCS += tm4c129_syscontrol.c
+CHIP_CSRCS += tm4c129_sysctrl.c
 else
-CHIP_CSRCS += tiva_syscontrol.c
+CHIP_CSRCS += tiva_sysctrl.c
 endif
 
 ifneq ($(CONFIG_SCHED_TICKLESS),y)
diff --git a/arch/arm/src/tiva/chip.h b/arch/arm/src/tiva/chip.h
index 34f48cbda9f..ea739dc84f9 100644
--- a/arch/arm/src/tiva/chip.h
+++ b/arch/arm/src/tiva/chip.h
@@ -47,7 +47,7 @@
 /* Then get all of the register definitions */
 
 #include "hardware/tiva_memorymap.h"  /* Memory map */
-#include "hardware/tiva_syscontrol.h" /* System control module */
+#include "hardware/tiva_sysctrl.h"    /* System control module */
 #include "hardware/tiva_gpio.h"       /* GPIO modules */
 #include "hardware/tiva_uart.h"       /* UART modules */
 #include "hardware/tiva_i2c.h"        /* I2C modules */
diff --git a/arch/arm/src/tiva/common/tiva_adclow.c b/arch/arm/src/tiva/common/tiva_adclow.c
index cb903bb824c..3a4fdc1f0e3 100644
--- a/arch/arm/src/tiva/common/tiva_adclow.c
+++ b/arch/arm/src/tiva/common/tiva_adclow.c
@@ -83,7 +83,7 @@
 #include "tiva_adc.h"
 #include "hardware/tiva_adc.h"
 #include "hardware/tiva_pinmap.h"
-#include "hardware/tiva_syscontrol.h"
+#include "hardware/tiva_sysctrl.h"
 
 #ifdef CONFIG_TIVA_ADC
 
diff --git a/arch/arm/src/tiva/common/tiva_eeprom.c b/arch/arm/src/tiva/common/tiva_eeprom.c
index c9e72e9b817..9dd6b68a038 100644
--- a/arch/arm/src/tiva/common/tiva_eeprom.c
+++ b/arch/arm/src/tiva/common/tiva_eeprom.c
@@ -48,7 +48,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "hardware/tiva_syscontrol.h"
+#include "hardware/tiva_sysctrl.h"
 #include "tiva_eeprom.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/tiva/common/tiva_i2c.c b/arch/arm/src/tiva/common/tiva_i2c.c
index 527e183cf17..04004bee435 100644
--- a/arch/arm/src/tiva/common/tiva_i2c.c
+++ b/arch/arm/src/tiva/common/tiva_i2c.c
@@ -69,7 +69,7 @@
 #include "tiva_enableclks.h"
 #include "tiva_gpio.h"
 #include "hardware/tiva_pinmap.h"
-#include "hardware/tiva_syscontrol.h"
+#include "hardware/tiva_sysctrl.h"
 #include "tiva_i2c.h"
 
 /* At least one I2C peripheral must be enabled */
diff --git a/arch/arm/src/tiva/common/tiva_start.c b/arch/arm/src/tiva/common/tiva_start.c
index c71986354ea..f9bca0ae047 100644
--- a/arch/arm/src/tiva/common/tiva_start.c
+++ b/arch/arm/src/tiva/common/tiva_start.c
@@ -54,7 +54,7 @@
 #include "up_internal.h"
 
 #include "tiva_lowputc.h"
-#include "tiva_syscontrol.h"
+#include "tiva_sysctrl.h"
 #include "tiva_userspace.h"
 #include "tiva_eeprom.h"
 #include "tiva_start.h"
diff --git a/arch/arm/src/tiva/common/tiva_syscontrol.c b/arch/arm/src/tiva/common/tiva_sysctrl.c
similarity index 99%
rename from arch/arm/src/tiva/common/tiva_syscontrol.c
rename to arch/arm/src/tiva/common/tiva_sysctrl.c
index 72897ae3fef..77f952a856c 100644
--- a/arch/arm/src/tiva/common/tiva_syscontrol.c
+++ b/arch/arm/src/tiva/common/tiva_sysctrl.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/tiva/common/tiva_syscontrol.c
+ * arch/arm/src/tiva/common/tiva_sysctrl.c
  *
  *   Copyright (C) 2009-2014, 2018 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -49,7 +49,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 #include "chip.h"
-#include "tiva_syscontrol.h"
+#include "tiva_sysctrl.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/tiva/common/tiva_timerlib.c b/arch/arm/src/tiva/common/tiva_timerlib.c
index 621a71f77b6..38dfffbe478 100644
--- a/arch/arm/src/tiva/common/tiva_timerlib.c
+++ b/arch/arm/src/tiva/common/tiva_timerlib.c
@@ -51,7 +51,7 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "hardware/tiva_syscontrol.h"
+#include "hardware/tiva_sysctrl.h"
 #include "hardware/tiva_timer.h"
 
 #include "tiva_enableclks.h"
diff --git a/arch/arm/src/tiva/hardware/cc13x2_cc26x2_v1/cc13x2_cc26x2_v1_memorymap.h b/arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_v1_memorymap.h
similarity index 96%
rename from arch/arm/src/tiva/hardware/cc13x2_cc26x2_v1/cc13x2_cc26x2_v1_memorymap.h
rename to arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_v1_memorymap.h
index 13802dcd323..ee98c29c0c7 100644
--- a/arch/arm/src/tiva/hardware/cc13x2_cc26x2_v1/cc13x2_cc26x2_v1_memorymap.h
+++ b/arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_v1_memorymap.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * arch/arm/src/tiva/hardware/cc13x2_cc26x2_v1/cc13x2_cc26x2_v1_memorymap.h
+ * arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_v1_memorymap.h
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -41,8 +41,8 @@
  *
  ******************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_V1_CC13X2_CC26X2_V1_MEMORYMAP_H
-#define __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_V1_CC13X2_CC26X2_V1_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_CC13X2_CC26X2_V1_MEMORYMAP_H
+#define __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_CC13X2_CC26X2_V1_MEMORYMAP_H
 
 /******************************************************************************
  * Pre-processor Definitions
@@ -183,4 +183,4 @@
 #define CPU_TIPROP_BASE          0xe00fe000 /* CPU_TIPROP */
 #define CPU_ROM_TABLE_BASE       0xe00ff000 /* CPU_ROM_TABLE */
 
-#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_V1_CC13X2_CC26X2_V1_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_CC13X2_CC26X2_V1_MEMORYMAP_H */
diff --git a/arch/arm/src/tiva/hardware/cc13x2_cc26x2_v2/cc13x2_cc26x2_v2_memorymap.h b/arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_v2_memorymap.h
similarity index 96%
rename from arch/arm/src/tiva/hardware/cc13x2_cc26x2_v2/cc13x2_cc26x2_v2_memorymap.h
rename to arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_v2_memorymap.h
index 6cde60a1be9..e255ccf3d7b 100644
--- a/arch/arm/src/tiva/hardware/cc13x2_cc26x2_v2/cc13x2_cc26x2_v2_memorymap.h
+++ b/arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_v2_memorymap.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * arch/arm/src/tiva/hardware/cc13x2_cc26x2_v2/cc13x2_cc26x2_v2_memorymap.h
+ * arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_v2_memorymap.h
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -41,8 +41,8 @@
  *
  ******************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_V2_CC13X2_CC26X2_V2_MEMORYMAP_H
-#define __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_V2_CC13X2_CC26X2_V2_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_CC13X2_CC26X2_V2_MEMORYMAP_H
+#define __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_CC13X2_CC26X2_V2_MEMORYMAP_H
 
 /******************************************************************************
  * Pre-processor Definitions
@@ -183,4 +183,4 @@
 #define CPU_TIPROP_BASE          0xe00fe000 /* CPU_TIPROP */
 #define CPU_ROM_TABLE_BASE       0xe00ff000 /* CPU_ROM_TABLE */
 
-#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_V2_CC13X2_CC26X2_V2_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_CC13X2_CC26X2_V2_MEMORYMAP_H */
diff --git a/arch/arm/src/tiva/hardware/lm/lm3s_syscontrol.h b/arch/arm/src/tiva/hardware/lm/lm3s_sysctrl.h
similarity index 99%
rename from arch/arm/src/tiva/hardware/lm/lm3s_syscontrol.h
rename to arch/arm/src/tiva/hardware/lm/lm3s_sysctrl.h
index c5fc0a9b9d3..e1ae8549233 100644
--- a/arch/arm/src/tiva/hardware/lm/lm3s_syscontrol.h
+++ b/arch/arm/src/tiva/hardware/lm/lm3s_sysctrl.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/tiva/hardmware/lm/3s_syscontrol.h
+ * arch/arm/src/tiva/hardmware/lm/3s_sysctrl.h
  *
  *   Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/arm/src/tiva/hardware/lm/lm4f_syscontrol.h b/arch/arm/src/tiva/hardware/lm/lm4f_sysctrl.h
similarity index 99%
rename from arch/arm/src/tiva/hardware/lm/lm4f_syscontrol.h
rename to arch/arm/src/tiva/hardware/lm/lm4f_sysctrl.h
index 53df4de3e93..377b9303067 100644
--- a/arch/arm/src/tiva/hardware/lm/lm4f_syscontrol.h
+++ b/arch/arm/src/tiva/hardware/lm/lm4f_sysctrl.h
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/tiva/hardmware/lm/4f_syscontrol.h
+ * arch/arm/src/tiva/hardmware/lm/4f_sysctrl.h
  *
  *   Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/arm/src/tiva/hardware/tiva_memorymap.h b/arch/arm/src/tiva/hardware/tiva_memorymap.h
index 1e230c0f872..533bf970b72 100644
--- a/arch/arm/src/tiva/hardware/tiva_memorymap.h
+++ b/arch/arm/src/tiva/hardware/tiva_memorymap.h
@@ -53,9 +53,9 @@
 #elif defined(CONFIG_ARCH_CHIP_CC13X0)
 #  include "hardware/cc13x0/cc13x0_memorymap.h"
 #elif defined(CONFIG_ARCH_CHIP_CC13X2_V1)
-#  include "hardware/cc13x2_cc26x2_v1/cc13x2_cc26x2_v1_memorymap.h"
+#  include "hardware/cc13x2_cc26x2/cc13x2_cc26x2_v1_memorymap.h"
 #elif defined(CONFIG_ARCH_CHIP_CC13X2_V2)
-#  include "hardware/cc13x2_cc26x2_v2/cc13x2_cc26x2_v2_memorymap.h"
+#  include "hardware/cc13x2_cc26x2/cc13x2_cc26x2_v2_memorymap.h"
 #else
 #  error "Unsupported Tiva/Stellaris memory map"
 #endif
diff --git a/arch/arm/src/tiva/hardware/tiva_syscontrol.h b/arch/arm/src/tiva/hardware/tiva_sysctrl.h
similarity index 93%
rename from arch/arm/src/tiva/hardware/tiva_syscontrol.h
rename to arch/arm/src/tiva/hardware/tiva_sysctrl.h
index 261fe960ea3..2b2b27618d0 100644
--- a/arch/arm/src/tiva/hardware/tiva_syscontrol.h
+++ b/arch/arm/src/tiva/hardware/tiva_sysctrl.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/tiva/hardwaretiva_syscontrol.h
+ * arch/arm/src/tiva/hardwaretiva_sysctrl.h
  *
  *   Copyright (C) 2009-2010, 2013-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -46,13 +46,13 @@
 /* Include the system control header file for the specific Tiva/Stellaris chip */
 
 #if defined(CONFIG_ARCH_CHIP_LM3S)
-#  include "hardware/lm/lm3s_syscontrol.h"
+#  include "hardware/lm/lm3s_sysctrl.h"
 #elif defined(CONFIG_ARCH_CHIP_LM4F)
-#  include "hardware/lm/lm4f_syscontrol.h"
+#  include "hardware/lm/lm4f_sysctrl.h"
 #elif defined(CONFIG_ARCH_CHIP_TM4C123)
-#  include "hardware/tm4c/tm4c123_syscontrol.h"
+#  include "hardware/tm4c/tm4c123_sysctrl.h"
 #elif defined(CONFIG_ARCH_CHIP_TM4C129)
-#  include "hardware/tm4c/tm4c129_syscontrol.h"
+#  include "hardware/tm4c/tm4c129_sysctrl.h"
 #else
 #  error "Unsupported Tiva/Stellaris system control module"
 #endif
diff --git a/arch/arm/src/tiva/hardware/tm4c/tm4c123_syscontrol.h b/arch/arm/src/tiva/hardware/tm4c/tm4c123_sysctrl.h
similarity index 99%
rename from arch/arm/src/tiva/hardware/tm4c/tm4c123_syscontrol.h
rename to arch/arm/src/tiva/hardware/tm4c/tm4c123_sysctrl.h
index 249ff421667..ec48002440b 100644
--- a/arch/arm/src/tiva/hardware/tm4c/tm4c123_syscontrol.h
+++ b/arch/arm/src/tiva/hardware/tm4c/tm4c123_sysctrl.h
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/tiva/hardware/tm4c/tm4c123_syscontrol.h
+ * arch/arm/src/tiva/hardware/tm4c/tm4c123_sysctrl.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/arm/src/tiva/hardware/tm4c/tm4c129_syscontrol.h b/arch/arm/src/tiva/hardware/tm4c/tm4c129_sysctrl.h
similarity index 99%
rename from arch/arm/src/tiva/hardware/tm4c/tm4c129_syscontrol.h
rename to arch/arm/src/tiva/hardware/tm4c/tm4c129_sysctrl.h
index 2ccd1f50972..7574e147b05 100644
--- a/arch/arm/src/tiva/hardware/tm4c/tm4c129_syscontrol.h
+++ b/arch/arm/src/tiva/hardware/tm4c/tm4c129_sysctrl.h
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/tiva/hardware/tm4c/tm4c129_syscontrol.h
+ * arch/arm/src/tiva/hardware/tm4c/tm4c129_sysctrl.h
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/arm/src/tiva/tiva_enableclks.h b/arch/arm/src/tiva/tiva_enableclks.h
index 7e3b0a4600d..2a790b155d3 100644
--- a/arch/arm/src/tiva/tiva_enableclks.h
+++ b/arch/arm/src/tiva/tiva_enableclks.h
@@ -44,7 +44,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "hardware/tiva_syscontrol.h"
+#include "hardware/tiva_sysctrl.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/tiva/tiva_enablepwr.h b/arch/arm/src/tiva/tiva_enablepwr.h
index 379a52c4f42..1cf6c46b1b3 100644
--- a/arch/arm/src/tiva/tiva_enablepwr.h
+++ b/arch/arm/src/tiva/tiva_enablepwr.h
@@ -44,7 +44,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "hardware/tiva_syscontrol.h"
+#include "hardware/tiva_sysctrl.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/tiva/tiva_periphrdy.h b/arch/arm/src/tiva/tiva_periphrdy.h
index cce4e6297d1..9d27b105d4e 100644
--- a/arch/arm/src/tiva/tiva_periphrdy.h
+++ b/arch/arm/src/tiva/tiva_periphrdy.h
@@ -44,7 +44,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "hardware/tiva_syscontrol.h"
+#include "hardware/tiva_sysctrl.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/tiva/tiva_syscontrol.h b/arch/arm/src/tiva/tiva_sysctrl.h
similarity index 99%
rename from arch/arm/src/tiva/tiva_syscontrol.h
rename to arch/arm/src/tiva/tiva_sysctrl.h
index f79c66f5f63..e69d1704ef2 100644
--- a/arch/arm/src/tiva/tiva_syscontrol.h
+++ b/arch/arm/src/tiva/tiva_sysctrl.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/tiva/tiva_syscontrol.h
+ * arch/arm/src/tiva/tiva_sysctrl.h
  *
  *   Copyright (C) 2009-2010, 2013-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/arm/src/tiva/tm4c/tm4c129_syscontrol.c b/arch/arm/src/tiva/tm4c/tm4c129_sysctrl.c
similarity index 99%
rename from arch/arm/src/tiva/tm4c/tm4c129_syscontrol.c
rename to arch/arm/src/tiva/tm4c/tm4c129_sysctrl.c
index 7e7321e533a..ae3708eaaad 100644
--- a/arch/arm/src/tiva/tm4c/tm4c129_syscontrol.c
+++ b/arch/arm/src/tiva/tm4c/tm4c129_sysctrl.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/tiva/tm4c/tm4c129_syscontrol.c
+ * arch/arm/src/tiva/tm4c/tm4c129_sysctrl.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -49,7 +49,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 #include "chip.h"
-#include "tiva_syscontrol.h"
+#include "tiva_sysctrl.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/tiva/tm4c/tm4c_ethernet.c b/arch/arm/src/tiva/tm4c/tm4c_ethernet.c
index de506222942..09cc93ce1af 100644
--- a/arch/arm/src/tiva/tm4c/tm4c_ethernet.c
+++ b/arch/arm/src/tiva/tm4c/tm4c_ethernet.c
@@ -70,7 +70,7 @@
 
 #include "chip.h"
 #include "tiva_gpio.h"
-#include "tiva_syscontrol.h"
+#include "tiva_sysctrl.h"
 #include "tiva_enablepwr.h"
 #include "tiva_enableclks.h"
 #include "tiva_periphrdy.h"