diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e47cec6..b8095ea5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -184,7 +184,7 @@ file(GLOB IR_HDR ir/*.h)
 set(DRV_SRC
     driver/cl_options.cpp
     driver/configfile.cpp
-    driver/target.cpp
+    driver/targetmachine.cpp
     driver/toobj.cpp
     driver/tool.cpp
     driver/linker.cpp
@@ -196,7 +196,7 @@ set(DRV_HDR
     driver/cl_options.h
     driver/configfile.h
     driver/ldc-version.h
-    driver/target.h
+    driver/targetmachine.h
     driver/toobj.h
     driver/tool.h
 )
diff --git a/driver/main.cpp b/driver/main.cpp
index 27b2dfe8..8b95a2af 100644
--- a/driver/main.cpp
+++ b/driver/main.cpp
@@ -19,7 +19,7 @@
 #include "driver/configfile.h"
 #include "driver/ldc-version.h"
 #include "driver/linker.h"
-#include "driver/target.h"
+#include "driver/targetmachine.h"
 #include "driver/toobj.h"
 #include "gen/cl_helpers.h"
 #include "gen/irstate.h"
diff --git a/driver/target.cpp b/driver/targetmachine.cpp
similarity index 98%
rename from driver/target.cpp
rename to driver/targetmachine.cpp
index 4e4156aa..20b3ba29 100644
--- a/driver/target.cpp
+++ b/driver/targetmachine.cpp
@@ -1,4 +1,4 @@
-//===-- target.cpp --------------------------------------------------------===//
+//===-- targetmachine.cpp -------------------------------------------------===//
 //
 //                         LDC – the LLVM D compiler
 //
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "driver/target.h"
+#include "driver/targetmachine.h"
 #include "llvm/ADT/Triple.h"
 #include "llvm/MC/SubtargetFeature.h"
 #include "llvm/Support/Host.h"
diff --git a/driver/target.h b/driver/targetmachine.h
similarity index 95%
rename from driver/target.h
rename to driver/targetmachine.h
index 0b1b7926..0dd8018f 100644
--- a/driver/target.h
+++ b/driver/targetmachine.h
@@ -1,4 +1,4 @@
-//===-- driver/target.h - LLVM target setup ---------------------*- C++ -*-===//
+//===-- driver/targetmachine.h - LLVM target setup --------------*- C++ -*-===//
 //
 //                         LDC – the LLVM D compiler
 //