diff --git a/arch/x86/cache_s.s b/arch/x86/cache_s.S
similarity index 98%
rename from arch/x86/cache_s.s
rename to arch/x86/cache_s.S
index 0f010109f95..22f864173c1 100644
--- a/arch/x86/cache_s.s
+++ b/arch/x86/cache_s.S
@@ -1,4 +1,4 @@
-/* cache_s.s - cache manipulation */
+/* cache_s.S - cache manipulation */
 
 /*
  * Copyright (c) 2013-2014 Wind River Systems, Inc.
diff --git a/arch/x86/crt0.s b/arch/x86/crt0.S
similarity index 99%
rename from arch/x86/crt0.s
rename to arch/x86/crt0.S
index 6b24de8e72d..37b50c0f5f7 100644
--- a/arch/x86/crt0.s
+++ b/arch/x86/crt0.S
@@ -1,4 +1,4 @@
-/* crt0.s - crt0 module for the IA-32 boards */
+/* crt0.S - crt0 module for the IA-32 boards */
 
 /*
  * Copyright (c) 2010-2014 Wind River Systems, Inc.
diff --git a/arch/x86/driver_static_irq_stubs.s b/arch/x86/driver_static_irq_stubs.S
similarity index 99%
rename from arch/x86/driver_static_irq_stubs.s
rename to arch/x86/driver_static_irq_stubs.S
index 69fde727cfd..b5bf2a1430b 100644
--- a/arch/x86/driver_static_irq_stubs.s
+++ b/arch/x86/driver_static_irq_stubs.S
@@ -1,4 +1,4 @@
-/* driver_static_irq_stubs.s - interrupt stubs */
+/* driver_static_irq_stubs.S - interrupt stubs */
 
 /*
  * Copyright (c) 2012-2015, Wind River Systems, Inc.
diff --git a/drivers/interrupt_controller/i8259_boi.s b/drivers/interrupt_controller/i8259_boi.S
similarity index 99%
rename from drivers/interrupt_controller/i8259_boi.s
rename to drivers/interrupt_controller/i8259_boi.S
index f46a4e0b64e..d4ddcbb3ae4 100644
--- a/drivers/interrupt_controller/i8259_boi.s
+++ b/drivers/interrupt_controller/i8259_boi.S
@@ -1,4 +1,4 @@
-/* i8259Boi.s - Intel 8259A PIC BOI Handler */
+/* i8259Boi.S - Intel 8259A PIC BOI Handler */
 
 /*
  * Copyright (c) 2013-2015 Wind River Systems, Inc.