diff --git a/reactos/lib/string/i386/memchr.s b/reactos/lib/string/i386/memchr_asm.s
similarity index 100%
rename from reactos/lib/string/i386/memchr.s
rename to reactos/lib/string/i386/memchr_asm.s
diff --git a/reactos/lib/string/i386/memcpy.s b/reactos/lib/string/i386/memcpy_asm.s
similarity index 100%
rename from reactos/lib/string/i386/memcpy.s
rename to reactos/lib/string/i386/memcpy_asm.s
diff --git a/reactos/lib/string/i386/memmove.s b/reactos/lib/string/i386/memmove_asm.s
similarity index 100%
rename from reactos/lib/string/i386/memmove.s
rename to reactos/lib/string/i386/memmove_asm.s
diff --git a/reactos/lib/string/i386/memset.s b/reactos/lib/string/i386/memset_asm.s
similarity index 100%
rename from reactos/lib/string/i386/memset.s
rename to reactos/lib/string/i386/memset_asm.s
diff --git a/reactos/lib/string/i386/strcat.s b/reactos/lib/string/i386/strcat_asm.s
similarity index 100%
rename from reactos/lib/string/i386/strcat.s
rename to reactos/lib/string/i386/strcat_asm.s
diff --git a/reactos/lib/string/i386/strchr.s b/reactos/lib/string/i386/strchr_asm.s
similarity index 100%
rename from reactos/lib/string/i386/strchr.s
rename to reactos/lib/string/i386/strchr_asm.s
diff --git a/reactos/lib/string/i386/strcmp.s b/reactos/lib/string/i386/strcmp_asm.s
similarity index 100%
rename from reactos/lib/string/i386/strcmp.s
rename to reactos/lib/string/i386/strcmp_asm.s
diff --git a/reactos/lib/string/i386/strcpy.s b/reactos/lib/string/i386/strcpy_asm.s
similarity index 100%
rename from reactos/lib/string/i386/strcpy.s
rename to reactos/lib/string/i386/strcpy_asm.s
diff --git a/reactos/lib/string/i386/strlen.s b/reactos/lib/string/i386/strlen_asm.s
similarity index 100%
rename from reactos/lib/string/i386/strlen.s
rename to reactos/lib/string/i386/strlen_asm.s
diff --git a/reactos/lib/string/i386/strncat.s b/reactos/lib/string/i386/strncat_asm.s
similarity index 100%
rename from reactos/lib/string/i386/strncat.s
rename to reactos/lib/string/i386/strncat_asm.s
diff --git a/reactos/lib/string/i386/strncmp.s b/reactos/lib/string/i386/strncmp_asm.s
similarity index 100%
rename from reactos/lib/string/i386/strncmp.s
rename to reactos/lib/string/i386/strncmp_asm.s
diff --git a/reactos/lib/string/i386/strncpy.s b/reactos/lib/string/i386/strncpy_asm.s
similarity index 100%
rename from reactos/lib/string/i386/strncpy.s
rename to reactos/lib/string/i386/strncpy_asm.s
diff --git a/reactos/lib/string/i386/strnlen.s b/reactos/lib/string/i386/strnlen_asm.s
similarity index 100%
rename from reactos/lib/string/i386/strnlen.s
rename to reactos/lib/string/i386/strnlen_asm.s
diff --git a/reactos/lib/string/i386/strrchr.s b/reactos/lib/string/i386/strrchr_asm.s
similarity index 100%
rename from reactos/lib/string/i386/strrchr.s
rename to reactos/lib/string/i386/strrchr_asm.s
diff --git a/reactos/lib/string/i386/wcscat.s b/reactos/lib/string/i386/wcscat_asm.s
similarity index 100%
rename from reactos/lib/string/i386/wcscat.s
rename to reactos/lib/string/i386/wcscat_asm.s
diff --git a/reactos/lib/string/i386/wcschr.s b/reactos/lib/string/i386/wcschr_asm.s
similarity index 100%
rename from reactos/lib/string/i386/wcschr.s
rename to reactos/lib/string/i386/wcschr_asm.s
diff --git a/reactos/lib/string/i386/wcscmp.s b/reactos/lib/string/i386/wcscmp_asm.s
similarity index 100%
rename from reactos/lib/string/i386/wcscmp.s
rename to reactos/lib/string/i386/wcscmp_asm.s
diff --git a/reactos/lib/string/i386/wcscpy.s b/reactos/lib/string/i386/wcscpy_asm.s
similarity index 100%
rename from reactos/lib/string/i386/wcscpy.s
rename to reactos/lib/string/i386/wcscpy_asm.s
diff --git a/reactos/lib/string/i386/wcslen.s b/reactos/lib/string/i386/wcslen_asm.s
similarity index 100%
rename from reactos/lib/string/i386/wcslen.s
rename to reactos/lib/string/i386/wcslen_asm.s
diff --git a/reactos/lib/string/i386/wcsncat.s b/reactos/lib/string/i386/wcsncat_asm.s
similarity index 100%
rename from reactos/lib/string/i386/wcsncat.s
rename to reactos/lib/string/i386/wcsncat_asm.s
diff --git a/reactos/lib/string/i386/wcsncmp.s b/reactos/lib/string/i386/wcsncmp_asm.s
similarity index 100%
rename from reactos/lib/string/i386/wcsncmp.s
rename to reactos/lib/string/i386/wcsncmp_asm.s
diff --git a/reactos/lib/string/i386/wcsncpy.s b/reactos/lib/string/i386/wcsncpy_asm.s
similarity index 100%
rename from reactos/lib/string/i386/wcsncpy.s
rename to reactos/lib/string/i386/wcsncpy_asm.s
diff --git a/reactos/lib/string/i386/wcsnlen.s b/reactos/lib/string/i386/wcsnlen_asm.s
similarity index 100%
rename from reactos/lib/string/i386/wcsnlen.s
rename to reactos/lib/string/i386/wcsnlen_asm.s
diff --git a/reactos/lib/string/i386/wcsrchr.s b/reactos/lib/string/i386/wcsrchr_asm.s
similarity index 100%
rename from reactos/lib/string/i386/wcsrchr.s
rename to reactos/lib/string/i386/wcsrchr_asm.s
diff --git a/reactos/lib/string/string.xml b/reactos/lib/string/string.xml
index c2bc2feb5e6..78bd02145f5 100644
--- a/reactos/lib/string/string.xml
+++ b/reactos/lib/string/string.xml
@@ -2,30 +2,30 @@
 	<define name="__NO_CTYPE_INLINES" />
 	<if property="ARCH" value="i386">
 		<directory name="i386">
-			<file>memchr.s</file>
-			<file>memcpy.s</file>
-			<file>memmove.s</file>
-			<file>memset.s</file>
-			<file>strcat.s</file>
-			<file>strchr.s</file>
-			<file>strcmp.s</file>
-			<file>strcpy.s</file>
-			<file>strlen.s</file>
-			<file>strncat.s</file>
-			<file>strncmp.s</file>
-			<file>strncpy.s</file>
-			<file>strnlen.s</file>
-			<file>strrchr.s</file>
-			<file>wcscat.s</file>
-			<file>wcschr.s</file>
-			<file>wcscmp.s</file>
-			<file>wcscpy.s</file>
-			<file>wcslen.s</file>
-			<file>wcsncat.s</file>
-			<file>wcsncmp.s</file>
-			<file>wcsncpy.s</file>
-			<file>wcsnlen.s</file>
-			<file>wcsrchr.s</file>
+			<file>memchr_asm.s</file>
+			<file>memcpy_asm.s</file>
+			<file>memmove_asm.s</file>
+			<file>memset_asm.s</file>
+			<file>strcat_asm.s</file>
+			<file>strchr_asm.s</file>
+			<file>strcmp_asm.s</file>
+			<file>strcpy_asm.s</file>
+			<file>strlen_asm.s</file>
+			<file>strncat_asm.s</file>
+			<file>strncmp_asm.s</file>
+			<file>strncpy_asm.s</file>
+			<file>strnlen_asm.s</file>
+			<file>strrchr_asm.s</file>
+			<file>wcscat_asm.s</file>
+			<file>wcschr_asm.s</file>
+			<file>wcscmp_asm.s</file>
+			<file>wcscpy_asm.s</file>
+			<file>wcslen_asm.s</file>
+			<file>wcsncat_asm.s</file>
+			<file>wcsncmp_asm.s</file>
+			<file>wcsncpy_asm.s</file>
+			<file>wcsnlen_asm.s</file>
+			<file>wcsrchr_asm.s</file>
 		</directory>
 	</if>
 	<ifnot property="ARCH" value="i386">