diff --git a/rostests/winetests/gdi32/CMakeLists.txt b/rostests/winetests/gdi32/CMakeLists.txt
index ec6bf16facf..6de9f0a20d9 100644
--- a/rostests/winetests/gdi32/CMakeLists.txt
+++ b/rostests/winetests/gdi32/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
     dib.c
     font.c
     gdiobj.c
-    generated_${ARCH}.c
+    generated.c
     icm.c
     mapping.c
     metafile.c
diff --git a/rostests/winetests/gdi32/generated_i386.c b/rostests/winetests/gdi32/generated.c
similarity index 100%
rename from rostests/winetests/gdi32/generated_i386.c
rename to rostests/winetests/gdi32/generated.c
diff --git a/rostests/winetests/kernel32/CMakeLists.txt b/rostests/winetests/kernel32/CMakeLists.txt
index b409160f623..85d4beb488a 100644
--- a/rostests/winetests/kernel32/CMakeLists.txt
+++ b/rostests/winetests/kernel32/CMakeLists.txt
@@ -17,7 +17,7 @@ list(APPEND SOURCE
     fiber.c
     file.c
     format_msg.c
-    #generated_${ARCH}.c
+    #generated.c
     heap.c
     loader.c
     locale.c
diff --git a/rostests/winetests/kernel32/generated_i386.c b/rostests/winetests/kernel32/generated.c
similarity index 100%
rename from rostests/winetests/kernel32/generated_i386.c
rename to rostests/winetests/kernel32/generated.c
diff --git a/rostests/winetests/ntdll/CMakeLists.txt b/rostests/winetests/ntdll/CMakeLists.txt
index f69ce5218fc..e1b3b998bfa 100644
--- a/rostests/winetests/ntdll/CMakeLists.txt
+++ b/rostests/winetests/ntdll/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
     error.c
     exception.c
     file.c
-    generated_${ARCH}.c
+    generated.c
     info.c
     large_int.c
     om.c
diff --git a/rostests/winetests/ntdll/generated_i386.c b/rostests/winetests/ntdll/generated.c
similarity index 100%
rename from rostests/winetests/ntdll/generated_i386.c
rename to rostests/winetests/ntdll/generated.c
diff --git a/rostests/winetests/rpcrt4/CMakeLists.txt b/rostests/winetests/rpcrt4/CMakeLists.txt
index e2e971fa1b7..f2b11444099 100644
--- a/rostests/winetests/rpcrt4/CMakeLists.txt
+++ b/rostests/winetests/rpcrt4/CMakeLists.txt
@@ -10,7 +10,7 @@ unset(IDL_FLAGS)
 
 list(APPEND SOURCE
     cstub.c
-    generated_${ARCH}.c
+    generated.c
     ndr_marshall.c
     rpc.c
     rpc_async.c
diff --git a/rostests/winetests/rpcrt4/generated_i386.c b/rostests/winetests/rpcrt4/generated.c
similarity index 100%
rename from rostests/winetests/rpcrt4/generated_i386.c
rename to rostests/winetests/rpcrt4/generated.c
diff --git a/rostests/winetests/shell32/CMakeLists.txt b/rostests/winetests/shell32/CMakeLists.txt
index 16b629421a4..525bd5f2915 100644
--- a/rostests/winetests/shell32/CMakeLists.txt
+++ b/rostests/winetests/shell32/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     autocomplete.c
     brsfolder.c
     ebrowser.c
-    generated_${ARCH}.c
+    generated.c
     progman_dde.c
     recyclebin.c
     shelldispatch.c
diff --git a/rostests/winetests/shell32/generated_i386.c b/rostests/winetests/shell32/generated.c
similarity index 100%
rename from rostests/winetests/shell32/generated_i386.c
rename to rostests/winetests/shell32/generated.c
diff --git a/rostests/winetests/shlwapi/CMakeLists.txt b/rostests/winetests/shlwapi/CMakeLists.txt
index 8fdeee24757..400cba13bcf 100644
--- a/rostests/winetests/shlwapi/CMakeLists.txt
+++ b/rostests/winetests/shlwapi/CMakeLists.txt
@@ -5,7 +5,7 @@ list(APPEND SOURCE
     assoc.c
     clist.c
     clsid.c
-    generated_${ARCH}.c
+    generated.c
     istream.c
     ordinal.c
     path.c
diff --git a/rostests/winetests/shlwapi/generated_i386.c b/rostests/winetests/shlwapi/generated.c
similarity index 100%
rename from rostests/winetests/shlwapi/generated_i386.c
rename to rostests/winetests/shlwapi/generated.c
diff --git a/rostests/winetests/urlmon/CMakeLists.txt b/rostests/winetests/urlmon/CMakeLists.txt
index 8d6c43ec228..f2a1106b334 100644
--- a/rostests/winetests/urlmon/CMakeLists.txt
+++ b/rostests/winetests/urlmon/CMakeLists.txt
@@ -2,7 +2,7 @@
 add_definitions(-DUSE_WINE_TODOS)
 
 list(APPEND SOURCE
-    generated_${ARCH}.c
+    generated.c
     misc.c
     protocol.c
     sec_mgr.c
diff --git a/rostests/winetests/urlmon/generated_i386.c b/rostests/winetests/urlmon/generated.c
similarity index 100%
rename from rostests/winetests/urlmon/generated_i386.c
rename to rostests/winetests/urlmon/generated.c
diff --git a/rostests/winetests/user32/CMakeLists.txt b/rostests/winetests/user32/CMakeLists.txt
index cb133a08c5e..d10f4cb3bcf 100644
--- a/rostests/winetests/user32/CMakeLists.txt
+++ b/rostests/winetests/user32/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
     dde.c
     dialog.c
     edit.c    
-    generated_${ARCH}.c
+    generated.c
     input.c
     listbox.c
     menu.c
diff --git a/rostests/winetests/user32/generated_i386.c b/rostests/winetests/user32/generated.c
similarity index 100%
rename from rostests/winetests/user32/generated_i386.c
rename to rostests/winetests/user32/generated.c
diff --git a/rostests/winetests/wininet/CMakeLists.txt b/rostests/winetests/wininet/CMakeLists.txt
index 7756a0f5df9..cb81ec8892d 100644
--- a/rostests/winetests/wininet/CMakeLists.txt
+++ b/rostests/winetests/wininet/CMakeLists.txt
@@ -3,7 +3,7 @@ add_definitions(-DUSE_WINE_TODOS)
 
 list(APPEND SOURCE
     ftp.c
-    generated_${ARCH}.c
+    generated.c
     http.c
     internet.c
     url.c
diff --git a/rostests/winetests/wininet/generated_i386.c b/rostests/winetests/wininet/generated.c
similarity index 100%
rename from rostests/winetests/wininet/generated_i386.c
rename to rostests/winetests/wininet/generated.c