diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Axis.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Axis.java
index 06a290d407192061a00c0e415acd24b43d65a0f2..4272173a51042702da42b2e4d68f8608f49f3ae9 100644
--- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Axis.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Axis.java
@@ -350,21 +350,20 @@ public class Axis implements ChartPart {
 
       if (getChartInternal().getChartInternalType() == ChartInternalType.Category) {
 
-        // pass in axis type instead of ChartInternal
         List<?> categories = (List<?>) getChartInternal().getSeriesMap().values().iterator().next().getXData();
         AxisType axisType = getChartInternal().getAxisPair().getXAxis().getAxisType();
-        return new AxisTickCategoryChartCalculator(getDirection(), workingSpace, categories, axisType, getChartInternal().getStyleManager());
+        return new AxisTickCalculator_Category(getDirection(), workingSpace, categories, axisType, getChartInternal().getStyleManager());
       }
       else if (getChartInternal().getChartInternalType() == ChartInternalType.XY && getAxisType() == AxisType.Date) {
 
-        return new AxisTickDateCalculator(getDirection(), workingSpace, getChartInternal().getxAxisMin(), getChartInternal().getxAxisMax(), getChartInternal().getStyleManager());
+        return new AxisTickCalculator_Date(getDirection(), workingSpace, getChartInternal().getxAxisMin(), getChartInternal().getxAxisMax(), getChartInternal().getStyleManager());
       }
       else if (getChartInternal().getStyleManager().isXAxisLogarithmic()) {
 
-        return new AxisTickLogarithmicCalculator(getDirection(), workingSpace, getChartInternal().getxAxisMin(), getChartInternal().getxAxisMax(), getChartInternal().getStyleManager());
+        return new AxisTickCalculator_Logarithmic(getDirection(), workingSpace, getChartInternal().getxAxisMin(), getChartInternal().getxAxisMax(), getChartInternal().getStyleManager());
       }
       else {
-        return new AxisTickNumberCalculator(getDirection(), workingSpace, getChartInternal().getxAxisMin(), getChartInternal().getxAxisMax(), getChartInternal().getStyleManager());
+        return new AxisTickCalculator_Number(getDirection(), workingSpace, getChartInternal().getxAxisMin(), getChartInternal().getxAxisMax(), getChartInternal().getStyleManager());
 
       }
     }
@@ -374,10 +373,10 @@ public class Axis implements ChartPart {
 
       if (getChartInternal().getStyleManager().isYAxisLogarithmic() && getAxisType() != AxisType.Date) {
 
-        return new AxisTickLogarithmicCalculator(getDirection(), workingSpace, getChartInternal().getyAxisMin(), getChartInternal().getyAxisMax(), getChartInternal().getStyleManager());
+        return new AxisTickCalculator_Logarithmic(getDirection(), workingSpace, getChartInternal().getyAxisMin(), getChartInternal().getyAxisMax(), getChartInternal().getStyleManager());
       }
       else {
-        return new AxisTickNumberCalculator(getDirection(), workingSpace, getChartInternal().getyAxisMin(), getChartInternal().getyAxisMax(), getChartInternal().getStyleManager());
+        return new AxisTickCalculator_Number(getDirection(), workingSpace, getChartInternal().getyAxisMin(), getChartInternal().getyAxisMax(), getChartInternal().getStyleManager());
 
       }
     }
diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickCategoryChartCalculator.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickCalculator_Category.java
similarity index 92%
rename from xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickCategoryChartCalculator.java
rename to xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickCalculator_Category.java
index ec2019af48a0f4855e2e885498498de36f1a86f6..c0bf69b19b80b1365c9015540a66fc7dfa2ff992 100644
--- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickCategoryChartCalculator.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickCalculator_Category.java
@@ -31,18 +31,18 @@ import org.knowm.xchart.internal.chartpart.Axis.Direction;
  *
  * @author timmolter
  */
-public class AxisTickCategoryChartCalculator extends AxisTickCalculator {
+public class AxisTickCalculator_Category extends AxisTickCalculator {
 
   /**
    * Constructor
    *
    * @param axisDirection
    * @param workingSpace
-   * @param minValue
-   * @param maxValue
+   * @param categories
+   * @param axisType
    * @param styleManager
    */
-  public AxisTickCategoryChartCalculator(Direction axisDirection, double workingSpace, List<?> categories, AxisType axisType, StyleManager styleManager) {
+  public AxisTickCalculator_Category(Direction axisDirection, double workingSpace, List<?> categories, AxisType axisType, StyleManager styleManager) {
 
     super(axisDirection, workingSpace, Double.NaN, Double.NaN, styleManager);
 
diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickDateCalculator.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickCalculator_Date.java
similarity index 97%
rename from xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickDateCalculator.java
rename to xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickCalculator_Date.java
index c76ba457243a747305fa18e138e293970f5aa744..4b641abc0ce609191e9e69f78a0d005b1d9545a6 100644
--- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickDateCalculator.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickCalculator_Date.java
@@ -30,7 +30,7 @@ import org.knowm.xchart.internal.chartpart.Axis.Direction;
  *
  * @author timmolter
  */
-public class AxisTickDateCalculator extends AxisTickCalculator {
+public class AxisTickCalculator_Date extends AxisTickCalculator {
 
   private static final long MILLIS_SCALE = TimeUnit.MILLISECONDS.toMillis(1L);
   private static final long SEC_SCALE = TimeUnit.SECONDS.toMillis(1L);
@@ -108,7 +108,7 @@ public class AxisTickDateCalculator extends AxisTickCalculator {
    * @param maxValue
    * @param styleManager
    */
-  public AxisTickDateCalculator(Direction axisDirection, double workingSpace, double minValue, double maxValue, StyleManager styleManager) {
+  public AxisTickCalculator_Date(Direction axisDirection, double workingSpace, double minValue, double maxValue, StyleManager styleManager) {
 
     super(axisDirection, workingSpace, minValue, maxValue, styleManager);
 
diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickLogarithmicCalculator.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickCalculator_Logarithmic.java
similarity index 95%
rename from xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickLogarithmicCalculator.java
rename to xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickCalculator_Logarithmic.java
index 6ed465df226419aed0776c755a69946732aeeb93..28ef661a2f0a0f4271e5a97e2b781cdcfa9db875 100644
--- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickLogarithmicCalculator.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickCalculator_Logarithmic.java
@@ -27,7 +27,7 @@ import org.knowm.xchart.internal.chartpart.Axis.Direction;
  *
  * @author timmolter
  */
-public class AxisTickLogarithmicCalculator extends AxisTickCalculator {
+public class AxisTickCalculator_Logarithmic extends AxisTickCalculator {
 
   NumberFormatter numberFormatter = null;
 
@@ -40,7 +40,7 @@ public class AxisTickLogarithmicCalculator extends AxisTickCalculator {
    * @param maxValue
    * @param styleManager
    */
-  public AxisTickLogarithmicCalculator(Direction axisDirection, double workingSpace, double minValue, double maxValue, StyleManager styleManager) {
+  public AxisTickCalculator_Logarithmic(Direction axisDirection, double workingSpace, double minValue, double maxValue, StyleManager styleManager) {
 
     super(axisDirection, workingSpace, minValue, maxValue, styleManager);
     numberFormatter = new NumberFormatter(styleManager);
diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickNumberCalculator.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickCalculator_Number.java
similarity index 96%
rename from xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickNumberCalculator.java
rename to xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickCalculator_Number.java
index 26ec9be0fcb9331f8984ea2de537159b64e2ce50..4cbdce015560734524b693cd22077bb4987d353f 100644
--- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickNumberCalculator.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickCalculator_Number.java
@@ -28,7 +28,7 @@ import org.knowm.xchart.internal.chartpart.Axis.Direction;
  *
  * @author timmolter
  */
-public class AxisTickNumberCalculator extends AxisTickCalculator {
+public class AxisTickCalculator_Number extends AxisTickCalculator {
 
   NumberFormatter numberFormatter = null;
 
@@ -41,7 +41,7 @@ public class AxisTickNumberCalculator extends AxisTickCalculator {
    * @param maxValue
    * @param styleManager
    */
-  public AxisTickNumberCalculator(Direction axisDirection, double workingSpace, double minValue, double maxValue, StyleManager styleManager) {
+  public AxisTickCalculator_Number(Direction axisDirection, double workingSpace, double minValue, double maxValue, StyleManager styleManager) {
 
     super(axisDirection, workingSpace, minValue, maxValue, styleManager);
     numberFormatter = new NumberFormatter(styleManager);