diff --git a/arch/arm/src/am335x/am335x_clockconfig.c b/arch/arm/src/am335x/am335x_clockconfig.c
index 50e8a8b7f80..380c07fe7b2 100644
--- a/arch/arm/src/am335x/am335x_clockconfig.c
+++ b/arch/arm/src/am335x/am335x_clockconfig.c
@@ -40,7 +40,7 @@
 #include <nuttx/config.h>
 
 #include "up_arch.h"
-#include "hardware/am335x_cm.h"
+#include "hardware/am335x_prcm.h"
 #include "am335x_config.h"
 #include "am335x_clockconfig.h"
 
diff --git a/arch/arm/src/am335x/am335x_edid.c b/arch/arm/src/am335x/am335x_edid.c
index 1d5aed8d177..8d720ada12a 100644
--- a/arch/arm/src/am335x/am335x_edid.c
+++ b/arch/arm/src/am335x/am335x_edid.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/am335x/am335x_wdog.c
+ * arch/arm/src/am335x/am335x_edid.c
  *
  *   Copyright (C) 2019 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/arm/src/am335x/am335x_lcdc.c b/arch/arm/src/am335x/am335x_lcdc.c
index f629ed932ad..aebca6d358d 100644
--- a/arch/arm/src/am335x/am335x_lcdc.c
+++ b/arch/arm/src/am335x/am335x_lcdc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/am225x/am335x_lcd.c
+ * arch/arm/src/am225x/am335x_lcdc.c
  *
  *   Copyright (C) 2019 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -56,7 +56,7 @@
 #include <nuttx/video/fb.h>
 
 #include "up_arch.h"
-#include "hardware/am335x_cm.h"
+#include "hardware/am335x_prcm.h"
 #include "am335x_pinmux.h"
 #include "am335x_config.h"
 #include "am335x_gpio.h"
diff --git a/arch/arm/src/am335x/hardware/am335x_dcan.h b/arch/arm/src/am335x/hardware/am335x_dcan.h
index e8c6e803077..3fdee9ca83c 100644
--- a/arch/arm/src/am335x/hardware/am335x_dcan.h
+++ b/arch/arm/src/am335x/hardware/am335x_dcan.h
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/am335x/hardware/am335x_cm.h
+ * arch/arm/src/am335x/hardware/am335x_dcan.h
  *
  *   Copyright (C) 2019 Petro Karashchenko. All rights reserved.
  *   Author: Petro Karashchenko <petro.karashchenko@gmail.com>
diff --git a/arch/arm/src/am335x/hardware/am335x_cm.h b/arch/arm/src/am335x/hardware/am335x_prcm.h
similarity index 99%
rename from arch/arm/src/am335x/hardware/am335x_cm.h
rename to arch/arm/src/am335x/hardware/am335x_prcm.h
index 1618daaf4ba..933f2b3b953 100644
--- a/arch/arm/src/am335x/hardware/am335x_cm.h
+++ b/arch/arm/src/am335x/hardware/am335x_prcm.h
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/am335x/hardware/am335x_cm.h
+ * arch/arm/src/am335x/hardware/am335x_prcm.h
  *
  *   Copyright (C) 2019 Petro Karashchenko. All rights reserved.
  *   Author: Petro Karashchenko <petro.karashchenko@gmail.com>
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_AM335X_HARDWARE_AM335X_CM_H
-#define __ARCH_ARM_SRC_AM335X_HARDWARE_AM335X_CM_H
+#ifndef __ARCH_ARM_SRC_AM335X_HARDWARE_AM335X_PRCM_H
+#define __ARCH_ARM_SRC_AM335X_HARDWARE_AM335X_PRCM_H
 
 /********************************************************************************************
  * Included Files
@@ -365,4 +365,4 @@
 #  define CM_DPLL_DMTIMER1_CLKSEL_CLK_RC32K             (3 << CM_DPLL_DMTIMER1MS_CLKSEL_SHIFT) /* Select CLK_RC32K clock */
 #  define CM_DPLL_DMTIMER1_CLKSEL_CLK_32768             (4 << CM_DPLL_DMTIMER1MS_CLKSEL_SHIFT) /* Selects the CLK_32768 from 32KHz Crystal Osc */
 
-#endif /* __ARCH_ARM_SRC_AM335X_HARDWARE_AM335X_CM_H */
+#endif /* __ARCH_ARM_SRC_AM335X_HARDWARE_AM335X_PRCM_H */
diff --git a/configs/beaglebone-black/src/am335x_lcd.c b/configs/beaglebone-black/src/am335x_lcd.c
index 0a4dd53577b..104098fd8bc 100644
--- a/configs/beaglebone-black/src/am335x_lcd.c
+++ b/configs/beaglebone-black/src/am335x_lcd.c
@@ -162,7 +162,7 @@ int up_fbinitialize(int display)
 
    am335x_lcd_videomode(videomode, &panel);
 
-  /* Initialize the LCD controller using this video mode */
+  /* Initialize the LCD controller using this panel configuration */
 
   ret = am335x_lcd_initialize(&panel);
   if (ret < 0)