diff --git a/android_app/app/src/main/java/com/health/openscale/core/bodymetric/BFDeurenberg.java b/android_app/app/src/main/java/com/health/openscale/core/bodymetric/BFDeurenberg.java
index 0e31a5c8..7d5b4818 100644
--- a/android_app/app/src/main/java/com/health/openscale/core/bodymetric/BFDeurenberg.java
+++ b/android_app/app/src/main/java/com/health/openscale/core/bodymetric/BFDeurenberg.java
@@ -21,7 +21,7 @@ import com.health.openscale.core.datatypes.ScaleUser;
 public class BFDeurenberg extends EstimatedFatMetric {
     @Override
     public String getName() {
-        return "Deurenberg et. al (1998)";
+        return "Deurenberg (1992)";
     }
 
     @Override
diff --git a/android_app/app/src/main/java/com/health/openscale/core/bodymetric/BFBJoN.java b/android_app/app/src/main/java/com/health/openscale/core/bodymetric/BFDeurenbergII.java
similarity index 92%
rename from android_app/app/src/main/java/com/health/openscale/core/bodymetric/BFBJoN.java
rename to android_app/app/src/main/java/com/health/openscale/core/bodymetric/BFDeurenbergII.java
index 043b1913..f22be910 100644
--- a/android_app/app/src/main/java/com/health/openscale/core/bodymetric/BFBJoN.java
+++ b/android_app/app/src/main/java/com/health/openscale/core/bodymetric/BFDeurenbergII.java
@@ -18,10 +18,10 @@ package com.health.openscale.core.bodymetric;
 import com.health.openscale.core.datatypes.ScaleData;
 import com.health.openscale.core.datatypes.ScaleUser;
 
-public class BFBJoN extends EstimatedFatMetric {
+public class BFDeurenbergII extends EstimatedFatMetric {
     @Override
     public String getName() {
-        return "British Journal of Nutrition (1991)";
+        return "Deurenberg et. al (1991)";
     }
 
     @Override
diff --git a/android_app/app/src/main/java/com/health/openscale/core/bodymetric/EstimatedFatMetric.java b/android_app/app/src/main/java/com/health/openscale/core/bodymetric/EstimatedFatMetric.java
index 83d11a2a..0ef9f6bc 100644
--- a/android_app/app/src/main/java/com/health/openscale/core/bodymetric/EstimatedFatMetric.java
+++ b/android_app/app/src/main/java/com/health/openscale/core/bodymetric/EstimatedFatMetric.java
@@ -19,14 +19,14 @@ import com.health.openscale.core.datatypes.ScaleData;
 import com.health.openscale.core.datatypes.ScaleUser;
 
 public abstract class EstimatedFatMetric {
-    public enum FORMULA { BF_DEURENBERG, BF_BJoN, BF_EDDY, BF_GALLAGHER, BF_GALLAGHER_ASIAN };
+    public enum FORMULA { BF_DEURENBERG, BF_DEURENBERG_II, BF_EDDY, BF_GALLAGHER, BF_GALLAGHER_ASIAN };
 
     public static EstimatedFatMetric getEstimatedMetric( FORMULA metric) {
         switch (metric) {
             case BF_DEURENBERG:
                 return new BFDeurenberg();
-            case BF_BJoN:
-                return new BFBJoN();
+            case BF_DEURENBERG_II:
+                return new BFDeurenbergII();
             case BF_EDDY:
                 return new BFEddy();
             case BF_GALLAGHER:
diff --git a/android_app/app/src/main/java/com/health/openscale/core/bodymetric/TBWBehnke.java b/android_app/app/src/main/java/com/health/openscale/core/bodymetric/TBWBehnke.java
index 53a6ba54..5e53cbcc 100644
--- a/android_app/app/src/main/java/com/health/openscale/core/bodymetric/TBWBehnke.java
+++ b/android_app/app/src/main/java/com/health/openscale/core/bodymetric/TBWBehnke.java
@@ -21,7 +21,7 @@ import com.health.openscale.core.datatypes.ScaleUser;
 public class TBWBehnke extends EstimatedWaterMetric {
     @Override
     public String getName() {
-        return "Behnke et. al (1963)";
+        return "Behnke (1963)";
     }
 
     @Override
diff --git a/android_app/app/src/main/java/com/health/openscale/core/bodymetric/TBWLeeSongKim.java b/android_app/app/src/main/java/com/health/openscale/core/bodymetric/TBWLeeSongKim.java
index 0f578345..b18c3fbd 100644
--- a/android_app/app/src/main/java/com/health/openscale/core/bodymetric/TBWLeeSongKim.java
+++ b/android_app/app/src/main/java/com/health/openscale/core/bodymetric/TBWLeeSongKim.java
@@ -21,7 +21,7 @@ import com.health.openscale.core.datatypes.ScaleUser;
 public class TBWLeeSongKim extends EstimatedWaterMetric {
     @Override
     public String getName() {
-        return "Lee, Song, Kim, Lee et. al (1999)";
+        return "Lee, Song, Kim, Lee et. al (2001)";
     }
 
     @Override