diff --git a/src/video/arm/pixman-arm-neon-asm.S b/src/video/arm/pixman-arm-neon-asm.S
index ab9bccef9..e6ef64603 100644
--- a/src/video/arm/pixman-arm-neon-asm.S
+++ b/src/video/arm/pixman-arm-neon-asm.S
@@ -217,9 +217,9 @@ pixman_asm_function name
 .endfunc
 .endm
 
-generate_fillrect_function FillRect32ARMNEONAsm, 32, 2
-generate_fillrect_function FillRect16ARMNEONAsm, 16, 1
-generate_fillrect_function FillRect8ARMNEONAsm,  8,  0
+generate_fillrect_function FillSurfaceRect32ARMNEONAsm, 32, 2
+generate_fillrect_function FillSurfaceRect16ARMNEONAsm, 16, 1
+generate_fillrect_function FillSurfaceRect8ARMNEONAsm,  8,  0
 
 /******************************************************************************/
 
diff --git a/src/video/arm/pixman-arm-simd-asm.S b/src/video/arm/pixman-arm-simd-asm.S
index d9c29993d..80f7ca30e 100644
--- a/src/video/arm/pixman-arm-simd-asm.S
+++ b/src/video/arm/pixman-arm-simd-asm.S
@@ -84,7 +84,7 @@
 .endm
 
 generate_composite_function \
-    FillRect32ARMSIMDAsm, 0, 0, 32, \
+    FillSurfaceRect32ARMSIMDAsm, 0, 0, 32, \
     FLAG_DST_WRITEONLY | FLAG_COND_EXEC | FLAG_PROCESS_PRESERVES_PSR | FLAG_PROCESS_DOES_STORE | FLAG_PROCESS_PRESERVES_SCRATCH \
     0, /* prefetch distance doesn't apply */ \
     FillRect32_init \
@@ -94,7 +94,7 @@ generate_composite_function \
     FillRect_process_tail
 
 generate_composite_function \
-    FillRect16ARMSIMDAsm, 0, 0, 16, \
+    FillSurfaceRect16ARMSIMDAsm, 0, 0, 16, \
     FLAG_DST_WRITEONLY | FLAG_COND_EXEC | FLAG_PROCESS_PRESERVES_PSR | FLAG_PROCESS_DOES_STORE | FLAG_PROCESS_PRESERVES_SCRATCH \
     0, /* prefetch distance doesn't apply */ \
     FillRect16_init \
@@ -104,7 +104,7 @@ generate_composite_function \
     FillRect_process_tail
 
 generate_composite_function \
-    FillRect8ARMSIMDAsm, 0, 0, 8, \
+    FillSurfaceRect8ARMSIMDAsm, 0, 0, 8, \
     FLAG_DST_WRITEONLY | FLAG_COND_EXEC | FLAG_PROCESS_PRESERVES_PSR | FLAG_PROCESS_DOES_STORE | FLAG_PROCESS_PRESERVES_SCRATCH \
     0, /* prefetch distance doesn't apply */ \
     FillRect8_init \