diff --git a/include/arch/arm/arch/machine.h b/include/arch/arm/arch/machine.h
index 6f09e37b8ad8e3ce55195b40f8f5bb4a64f8087a..5560a1718b8e3316712e47e48df8df75f756c099 100644
--- a/include/arch/arm/arch/machine.h
+++ b/include/arch/arm/arch/machine.h
@@ -33,7 +33,7 @@ void setIRQTrigger(irq_t irq, bool_t trigger);
 static inline void plat_cleanL2Range(paddr_t start, paddr_t end);
 static inline void plat_invalidateL2Range(paddr_t start, paddr_t end);
 static inline void plat_cleanInvalidateL2Range(paddr_t start, paddr_t end);
-static inline void plat_cleanInvalidateCache(void);
+static inline void plat_cleanInvalidateL2Cache(void);
 
 void cleanInvalidateCacheRange_RAM(word_t start, word_t end, paddr_t pstart);
 void cleanCacheRange_RAM(word_t start, word_t end, paddr_t pstart);
diff --git a/include/arch/arm/arch/machine/l2c_310.h b/include/arch/arm/arch/machine/l2c_310.h
index ef3ca6190569a26b3f367ead4f97e973b810d499..e1c4ece791b9106947174e4877d474438ca91790 100644
--- a/include/arch/arm/arch/machine/l2c_310.h
+++ b/include/arch/arm/arch/machine/l2c_310.h
@@ -20,7 +20,7 @@
 
 void initL2Cache(void);
 
-void plat_cleanInvalidateCache(void);
+void plat_cleanInvalidateL2Cache(void);
 void plat_cleanCache(void);
 void plat_cleanL2Range(paddr_t start, paddr_t end);
 void plat_invalidateL2Range(paddr_t start, paddr_t end);
diff --git a/src/arch/arm/kernel/boot.c b/src/arch/arm/kernel/boot.c
index 14e740efad83b42274c121df2a9ef6ead06e64c6..2c5bef5e021e54638280567245a62a75105ea4f1 100644
--- a/src/arch/arm/kernel/boot.c
+++ b/src/arch/arm/kernel/boot.c
@@ -350,7 +350,7 @@ release_secondary_cpus(void)
      * turns on the cache. Thus, we do not need to clean and invaliate the cache.
      */
     cleanInvalidateL1Caches();
-    plat_cleanInvalidateCache();
+    plat_cleanInvalidateL2Cache();
 #endif
 
     /* Wait until all the secondary cores are done initialising */
diff --git a/src/arch/arm/machine/cache.c b/src/arch/arm/machine/cache.c
index 0c5ee031f18af932d67ab8446a054c6edc8e9fa0..b587cde11cd64df4653939a4106420c0cdffdf30 100644
--- a/src/arch/arm/machine/cache.c
+++ b/src/arch/arm/machine/cache.c
@@ -190,7 +190,7 @@ void
 arch_clean_invalidate_caches(void)
 {
     cleanCaches_PoU();
-    plat_cleanInvalidateCache();
+    plat_cleanInvalidateL2Cache();
     cleanInvalidateL1Caches();
     isb();
 }
diff --git a/src/arch/arm/machine/l2c_310.c b/src/arch/arm/machine/l2c_310.c
index 3072faa30b13ed10f34c1783883d1c01911a78e6..6b23461b8b7e1fb579d80f7a6574a03d721fb1d7 100644
--- a/src/arch/arm/machine/l2c_310.c
+++ b/src/arch/arm/machine/l2c_310.c
@@ -360,7 +360,7 @@ static inline void L2_cacheSync(void)
     while (l2cc->maintenance.cache_sync & MAINTENANCE_PENDING);
 }
 
-void plat_cleanInvalidateCache(void)
+void plat_cleanInvalidateL2Cache(void)
 {
     if (!config_set(CONFIG_DEBUG_DISABLE_L2_CACHE)) {
         l2cc->maintenance.clean_way = 0xffff;
diff --git a/src/arch/arm/machine/l2c_nop.c b/src/arch/arm/machine/l2c_nop.c
index 1277c927db2c88605c455737408b38d2b823ae2c..c5f46f99f8e74453417b42011e6da25f6216c0a9 100644
--- a/src/arch/arm/machine/l2c_nop.c
+++ b/src/arch/arm/machine/l2c_nop.c
@@ -19,4 +19,4 @@ void initL2Cache(void) {}
 void plat_cleanL2Range(paddr_t start, paddr_t end) {}
 void plat_invalidateL2Range(paddr_t start, paddr_t end) {}
 void plat_cleanInvalidateL2Range(paddr_t start, paddr_t end) {}
-void plat_cleanInvalidateCache(void) {}
+void plat_cleanInvalidateL2Cache(void) {}
diff --git a/src/plat/allwinnerA20/machine/l2cache.c b/src/plat/allwinnerA20/machine/l2cache.c
index 5e3a29486b06f5c1b803611879d6ead97a888008..fe18b4613774f52a52f980254fd9dcb98ebb32ba 100755
--- a/src/plat/allwinnerA20/machine/l2cache.c
+++ b/src/plat/allwinnerA20/machine/l2cache.c
@@ -44,4 +44,4 @@ initL2Cache(void)
 void plat_cleanL2Range(paddr_t start, paddr_t end) {}
 void plat_invalidateL2Range(paddr_t start, paddr_t end) {}
 void plat_cleanInvalidateL2Range(paddr_t start, paddr_t end) {}
-void plat_cleanInvalidateCache(void) {}
+void plat_cleanInvalidateL2Cache(void) {}
diff --git a/src/plat/am335x/machine/l2cache.c b/src/plat/am335x/machine/l2cache.c
index 9537555f7811189b0e369d39fad2736e124dc773..407b6d8cafb87f0b939d941c4643e143fcadf40f 100644
--- a/src/plat/am335x/machine/l2cache.c
+++ b/src/plat/am335x/machine/l2cache.c
@@ -44,4 +44,4 @@ initL2Cache(void)
 void plat_cleanL2Range(paddr_t start, paddr_t end) {}
 void plat_invalidateL2Range(paddr_t start, paddr_t end) {}
 void plat_cleanInvalidateL2Range(paddr_t start, paddr_t end) {}
-void plat_cleanInvalidateCache(void) {}
+void plat_cleanInvalidateL2Cache(void) {}
diff --git a/src/plat/imx31/machine/hardware.c b/src/plat/imx31/machine/hardware.c
index 7d513048369a65a112ed0894991ee9c651de64ab..720da49e538e944a445d4c4911489609b16b982d 100644
--- a/src/plat/imx31/machine/hardware.c
+++ b/src/plat/imx31/machine/hardware.c
@@ -143,7 +143,7 @@ void plat_cleanInvalidateL2Range(paddr_t start, paddr_t end)
     finaliseL2Op();
 }
 
-void plat_cleanInvalidateCache(void)
+void plat_cleanInvalidateL2Cache(void)
 {
     cleanL2();
     invalidateL2();
diff --git a/src/plat/omap3/machine/l2cache.c b/src/plat/omap3/machine/l2cache.c
index 9537555f7811189b0e369d39fad2736e124dc773..407b6d8cafb87f0b939d941c4643e143fcadf40f 100644
--- a/src/plat/omap3/machine/l2cache.c
+++ b/src/plat/omap3/machine/l2cache.c
@@ -44,4 +44,4 @@ initL2Cache(void)
 void plat_cleanL2Range(paddr_t start, paddr_t end) {}
 void plat_invalidateL2Range(paddr_t start, paddr_t end) {}
 void plat_cleanInvalidateL2Range(paddr_t start, paddr_t end) {}
-void plat_cleanInvalidateCache(void) {}
+void plat_cleanInvalidateL2Cache(void) {}