diff --git a/configs/dk-tm4c129x/src/dk-tm4c129x.h b/configs/dk-tm4c129x/src/dk-tm4c129x.h
index 5f0b89a707..2c78317ba9 100644
--- a/configs/dk-tm4c129x/src/dk-tm4c129x.h
+++ b/configs/dk-tm4c129x/src/dk-tm4c129x.h
@@ -177,7 +177,7 @@ void tm4c_led_initialize(void);
 int tm4c_bringup(void);
 
 /****************************************************************************
- * Name: tiva_timer_initialize
+ * Name: tiva_timer_configure
  *
  * Description:
  *   Configure the timer driver
@@ -185,7 +185,7 @@ int tm4c_bringup(void);
  ****************************************************************************/
 
 #ifdef CONFIG_DK_TM4C129X_TIMER
-int tiva_timer_initialize(void);
+int tiva_timer_configure(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
diff --git a/configs/dk-tm4c129x/src/tm4c_bringup.c b/configs/dk-tm4c129x/src/tm4c_bringup.c
index 16ebb76ed9..72fcac0292 100644
--- a/configs/dk-tm4c129x/src/tm4c_bringup.c
+++ b/configs/dk-tm4c129x/src/tm4c_bringup.c
@@ -181,7 +181,7 @@ int tm4c_bringup(void)
 #ifdef HAVE_TIMER
   /* Initialize the timer driver */
 
-  ret = tiva_timer_initialize();
+  ret = tiva_timer_configure();
   if (ret < 0)
     {
       dbg("ERROR: Failed to initialize timer driver: %d\n", ret);
diff --git a/configs/dk-tm4c129x/src/tm4c_timer.c b/configs/dk-tm4c129x/src/tm4c_timer.c
index e5b82d7141..e6cfe3e13c 100644
--- a/configs/dk-tm4c129x/src/tm4c_timer.c
+++ b/configs/dk-tm4c129x/src/tm4c_timer.c
@@ -91,14 +91,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: tiva_timer_initialize
+ * Name: tiva_timer_configure
  *
  * Description:
  *   Configure the timer driver
  *
  ****************************************************************************/
 
-int tiva_timer_initialize(void)
+int tiva_timer_configure(void)
 {
   int ret;
 
diff --git a/configs/tm4c123g-launchpad/src/tm4c123g-launchpad.h b/configs/tm4c123g-launchpad/src/tm4c123g-launchpad.h
index abb2193f3a..b9ca7ce480 100644
--- a/configs/tm4c123g-launchpad/src/tm4c123g-launchpad.h
+++ b/configs/tm4c123g-launchpad/src/tm4c123g-launchpad.h
@@ -226,7 +226,7 @@ int tm4c_at24_automount(int minor);
 #endif
 
 /****************************************************************************
- * Name: tiva_timer_initialize
+ * Name: tiva_timer_configure
  *
  * Description:
  *   Configure the timer driver
@@ -234,7 +234,7 @@ int tm4c_at24_automount(int minor);
  ****************************************************************************/
 
 #ifdef CONFIG_TIVA_TIMER
-int tiva_timer_initialize(void);
+int tiva_timer_configure(void);
 #endif
 
 /************************************************************************************
diff --git a/configs/tm4c123g-launchpad/src/tm4c_bringup.c b/configs/tm4c123g-launchpad/src/tm4c_bringup.c
index c277fbb710..48a8d649fe 100644
--- a/configs/tm4c123g-launchpad/src/tm4c_bringup.c
+++ b/configs/tm4c123g-launchpad/src/tm4c_bringup.c
@@ -77,10 +77,10 @@ int tm4c_bringup(void)
 #ifdef CONFIG_TIVA_TIMER
   /* Initialize the timer driver */
 
-  ret = tiva_timer_initialize();
+  ret = tiva_timer_configure();
   if (ret < 0)
     {
-      syslog(LOG_ERR, "ERROR: tiva_timer_initialize failed: %d\n", ret);
+      syslog(LOG_ERR, "ERROR: tiva_timer_configure failed: %d\n", ret);
       return ret;
     }
 #endif /* CONFIG_TIVA_TIMER */
diff --git a/configs/tm4c123g-launchpad/src/tm4c_timer.c b/configs/tm4c123g-launchpad/src/tm4c_timer.c
index 8bc01c6eda..19e961dd3f 100644
--- a/configs/tm4c123g-launchpad/src/tm4c_timer.c
+++ b/configs/tm4c123g-launchpad/src/tm4c_timer.c
@@ -62,14 +62,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: tiva_timer_initialize
+ * Name: tiva_timer_configure
  *
  * Description:
  *   Configure the timer driver for the timer example application.
  *
  ****************************************************************************/
 
-int tiva_timer_initialize(void)
+int tiva_timer_configure(void)
 {
   static bool initialized = false;
   int ret = OK;
diff --git a/configs/tm4c1294-launchpad/src/tm4c1294-launchpad.h b/configs/tm4c1294-launchpad/src/tm4c1294-launchpad.h
index f18fa39eb1..fb392a6c85 100644
--- a/configs/tm4c1294-launchpad/src/tm4c1294-launchpad.h
+++ b/configs/tm4c1294-launchpad/src/tm4c1294-launchpad.h
@@ -166,7 +166,7 @@ void tm4c_led_initialize(void);
 int tm4c_bringup(void);
 
 /****************************************************************************
- * Name: tiva_timer_initialize
+ * Name: tiva_timer_configure
  *
  * Description:
  *   Configure the timer driver
@@ -174,7 +174,7 @@ int tm4c_bringup(void);
  ****************************************************************************/
 
 #ifdef CONFIG_TM4C1294_LAUNCHPAD_TIMER
-int tiva_timer_initialize(void);
+int tiva_timer_configure(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
diff --git a/configs/tm4c1294-launchpad/src/tm4c_bringup.c b/configs/tm4c1294-launchpad/src/tm4c_bringup.c
index da1778d0fd..a6608ff431 100644
--- a/configs/tm4c1294-launchpad/src/tm4c_bringup.c
+++ b/configs/tm4c1294-launchpad/src/tm4c_bringup.c
@@ -161,7 +161,7 @@ int tm4c_bringup(void)
 #ifdef HAVE_TIMER
   /* Initialize the timer driver */
 
-  ret = tiva_timer_initialize();
+  ret = tiva_timer_configure();
   if (ret < 0)
     {
       dbg("ERROR: Failed to initialize timer driver: %d\n", ret);
diff --git a/configs/tm4c1294-launchpad/src/tm4c_timer.c b/configs/tm4c1294-launchpad/src/tm4c_timer.c
index 94f6ab0bb4..0d661307c3 100644
--- a/configs/tm4c1294-launchpad/src/tm4c_timer.c
+++ b/configs/tm4c1294-launchpad/src/tm4c_timer.c
@@ -90,14 +90,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: tiva_timer_initialize
+ * Name: tiva_timer_configure
  *
  * Description:
  *   Configure the timer driver
  *
  ****************************************************************************/
 
-int tiva_timer_initialize(void)
+int tiva_timer_configure(void)
 {
   int ret;