diff --git a/etc/fcl-json/src/fpjson.pp b/etc/fcl-json/src/xfpjson.pp
similarity index 99%
rename from etc/fcl-json/src/fpjson.pp
rename to etc/fcl-json/src/xfpjson.pp
index dd3dff58..e2eeb18e 100644
--- a/etc/fcl-json/src/fpjson.pp
+++ b/etc/fcl-json/src/xfpjson.pp
@@ -14,7 +14,7 @@
  **********************************************************************}
 {$mode objfpc}
 {$h+}
-unit fpjson;
+unit xfpjson;
 
 interface
 
diff --git a/etc/fcl-json/src/fpjsonrtti.pp b/etc/fcl-json/src/xfpjsonrtti.pp
similarity index 99%
rename from etc/fcl-json/src/fpjsonrtti.pp
rename to etc/fcl-json/src/xfpjsonrtti.pp
index e5381e07..057143e4 100644
--- a/etc/fcl-json/src/fpjsonrtti.pp
+++ b/etc/fcl-json/src/xfpjsonrtti.pp
@@ -5,7 +5,7 @@ unit fpjsonrtti;
 interface
 
 uses
-  Classes, SysUtils, contnrs, typinfo, fpjson, rttiutils, jsonparser;
+  Classes, SysUtils, contnrs, typinfo, xfpjson, rttiutils, xjsonparser;
 
 Const
   RFC3339DateTimeFormat = 'yyyy"-"mm"-"dd"T"hh":"nn":"ss';
diff --git a/etc/fcl-json/src/jsonconf.pp b/etc/fcl-json/src/xjsonconf.pp
similarity index 99%
rename from etc/fcl-json/src/jsonconf.pp
rename to etc/fcl-json/src/xjsonconf.pp
index 0d547552..53f96066 100644
--- a/etc/fcl-json/src/jsonconf.pp
+++ b/etc/fcl-json/src/xjsonconf.pp
@@ -28,7 +28,7 @@ unit jsonConf;
 interface
 
 uses
-  SysUtils, Classes, fpjson, jsonscanner, jsonparser;
+  SysUtils, Classes, xfpjson, xjsonscanner, xjsonparser;
 
 
 type
diff --git a/etc/fcl-json/src/jsonparser.pp b/etc/fcl-json/src/xjsonparser.pp
similarity index 99%
rename from etc/fcl-json/src/jsonparser.pp
rename to etc/fcl-json/src/xjsonparser.pp
index 5d9df0cf..fa6f0b7d 100644
--- a/etc/fcl-json/src/jsonparser.pp
+++ b/etc/fcl-json/src/xjsonparser.pp
@@ -14,12 +14,12 @@
  **********************************************************************}
 {$mode objfpc}
 {$h+}
-unit jsonparser;
+unit xjsonparser;
 
 interface
 
 uses
-  Classes, SysUtils, fpJSON, jsonscanner;
+  Classes, SysUtils, xfpJSON, xjsonscanner;
   
 Type
 
diff --git a/etc/fcl-json/src/jsonscanner.pp b/etc/fcl-json/src/xjsonscanner.pp
similarity index 99%
rename from etc/fcl-json/src/jsonscanner.pp
rename to etc/fcl-json/src/xjsonscanner.pp
index 43da6e41..10f0b275 100644
--- a/etc/fcl-json/src/jsonscanner.pp
+++ b/etc/fcl-json/src/xjsonscanner.pp
@@ -15,7 +15,7 @@
 {$mode objfpc}
 {$h+}
 
-unit jsonscanner;
+unit xjsonscanner;
 
 interface
 
diff --git a/src/ce_dubproject.pas b/src/ce_dubproject.pas
index a380da69..2c731197 100644
--- a/src/ce_dubproject.pas
+++ b/src/ce_dubproject.pas
@@ -5,7 +5,7 @@ unit ce_dubproject;
 interface
 
 uses
-  Classes, SysUtils, fpjson, jsonparser, jsonscanner, process, strutils, LazFileUtils,
+  Classes, SysUtils, xfpjson, xjsonparser, xjsonscanner, process, strutils, LazFileUtils,
   ce_common, ce_interfaces, ce_observer, ce_dialogs, ce_processes;
 
 type
diff --git a/src/ce_dubprojeditor.pas b/src/ce_dubprojeditor.pas
index 84dfd155..de3aef5a 100644
--- a/src/ce_dubprojeditor.pas
+++ b/src/ce_dubprojeditor.pas
@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, TreeFilterEdit, Forms, Controls, Graphics,
-  Dialogs, ExtCtrls, Menus, StdCtrls, Buttons, ComCtrls, jsonparser, fpjson,
+  Dialogs, ExtCtrls, Menus, StdCtrls, Buttons, ComCtrls, xjsonparser, xfpjson,
   ce_widget, ce_common, ce_interfaces, ce_observer, ce_dubproject, ce_sharedres;
 
 type