diff --git a/Code/JavaWrappers/ForceField.i b/Code/JavaWrappers/ForceField.i
index 89a9fad03..f85bab7f4 100644
--- a/Code/JavaWrappers/ForceField.i
+++ b/Code/JavaWrappers/ForceField.i
@@ -41,7 +41,7 @@
 #include <ForceField/UFF/AngleBend.h>
 #include <ForceField/UFF/BondStretch.h>
 #include <ForceField/UFF/Contribs.h>
-#include <ForceField/UFF/DistanceConstraint.h>
+#include <ForceField/DistanceConstraint.h>
 #include <ForceField/UFF/Nonbonded.h>
 #include <ForceField/UFF/TorsionAngle.h>
 #include <ForceField/UFF/Inversion.h>
@@ -59,7 +59,7 @@
 %include <ForceField/UFF/Params.h>
 %include <ForceField/UFF/AngleBend.h>
 %include <ForceField/UFF/BondStretch.h>
-%include <ForceField/UFF/DistanceConstraint.h>
+%include <ForceField/DistanceConstraint.h>
 %include <ForceField/UFF/Nonbonded.h>
 %include <ForceField/UFF/TorsionAngle.h>
 %include <ForceField/UFF/Inversion.h>
diff --git a/Code/JavaWrappers/csharp_wrapper/GraphMolCSharp.i b/Code/JavaWrappers/csharp_wrapper/GraphMolCSharp.i
index 264e3ce69..c90cf0f0e 100644
--- a/Code/JavaWrappers/csharp_wrapper/GraphMolCSharp.i
+++ b/Code/JavaWrappers/csharp_wrapper/GraphMolCSharp.i
@@ -181,7 +181,7 @@ typedef unsigned long long int	uintmax_t;
 %shared_ptr(ForceFields::ForceFieldContrib);
 %shared_ptr(ForceFields::UFF::AngleBendContrib);
 %shared_ptr(ForceFields::UFF::BondStretchContrib);
-%shared_ptr(ForceFields::UFF::DistanceConstraintContrib);
+%shared_ptr(ForceFields::DistanceConstraintContrib);
 %shared_ptr(ForceFields::UFF::vdWContrib);
 %shared_ptr(ForceFields::UFF::TorsionAngleContrib);
 %shared_ptr(ForceFields::UFF::InversionContrib);
diff --git a/Code/JavaWrappers/gmwrapper/GraphMolJava.i b/Code/JavaWrappers/gmwrapper/GraphMolJava.i
index e5fcb27a1..ab1312cac 100644
--- a/Code/JavaWrappers/gmwrapper/GraphMolJava.i
+++ b/Code/JavaWrappers/gmwrapper/GraphMolJava.i
@@ -125,7 +125,7 @@ typedef unsigned long long int	uintmax_t;
 %shared_ptr(ForceFields::ForceFieldContrib);
 %shared_ptr(ForceFields::UFF::AngleBendContrib);
 %shared_ptr(ForceFields::UFF::BondStretchContrib);
-%shared_ptr(ForceFields::UFF::DistanceConstraintContrib);
+%shared_ptr(ForceFields::DistanceConstraintContrib);
 %shared_ptr(ForceFields::UFF::vdWContrib);
 %shared_ptr(ForceFields::UFF::TorsionAngleContrib);
 %shared_ptr(ForceFields::UFF::InversionContrib);