diff --git a/src/main/java/org/meteogroup/griblibrary/grib1/Grib1GDSReader.java b/src/main/java/org/meteogroup/griblibrary/grib1/Grib1GDSReader.java
index 4118980..6dcf5c3 100644
--- a/src/main/java/org/meteogroup/griblibrary/grib1/Grib1GDSReader.java
+++ b/src/main/java/org/meteogroup/griblibrary/grib1/Grib1GDSReader.java
@@ -48,7 +48,7 @@ public int readGDSLength(byte[] inputValues, int offSet) throws BinaryNumberConv
 
     public Grib1GDS readGDSValues(byte[] inputValues, int offSet) throws BinaryNumberConversionException {
         Grib1GDS objectToWriteInto= new Grib1GDS();
-        objectToWriteInto.setGdsLenght(this.readGDSLength(inputValues, offSet));
+        objectToWriteInto.setGdsLength(this.readGDSLength(inputValues, offSet));
         objectToWriteInto.setNumberOfVerticalsCoordinateParams((short) (inputValues[POSITION_GDS_NUMBER_OF_VERTICAL_COORDINATE_PARAMS + offSet] & BytesToPrimitiveHelper.BYTE_MASK));
         objectToWriteInto.setLocationOfVerticalCoordinateParams((short) (inputValues[POSITION_GDS_LOCATION_OF_VERTICAL_PARAMS + offSet] & BytesToPrimitiveHelper.BYTE_MASK));
         objectToWriteInto.setRepresentationType((short) (inputValues[POSITION_GDS_REPRESENTATION_TYPE + offSet] & BytesToPrimitiveHelper.BYTE_MASK));
diff --git a/src/main/java/org/meteogroup/griblibrary/grib1/Grib1PDSReader.java b/src/main/java/org/meteogroup/griblibrary/grib1/Grib1PDSReader.java
index f70519f..4c6aea9 100644
--- a/src/main/java/org/meteogroup/griblibrary/grib1/Grib1PDSReader.java
+++ b/src/main/java/org/meteogroup/griblibrary/grib1/Grib1PDSReader.java
@@ -56,7 +56,7 @@ public int readPDSLength(byte[] values, int headerOffSet) throws BinaryNumberCon
     public Grib1PDS readPDSValues(byte[] values, int headerOffSet) throws BinaryNumberConversionException {
 
         Grib1PDS objectToReadInto = new Grib1PDS();
-        objectToReadInto.setPdsLenght(this.readPDSLength(values,headerOffSet));
+        objectToReadInto.setPdsLength(this.readPDSLength(values,headerOffSet));
         objectToReadInto.setParameterTableVersionNumber((short) (values[POSITION_PDS_TABLE_VERSION_NUMBER + headerOffSet] & BytesToPrimitiveHelper.BYTE_MASK));
         objectToReadInto.setIdentificationOfCentre((short)(values[POSITION_PDS_IDENTIFICATION_OF_CENTRE+headerOffSet] & BytesToPrimitiveHelper.BYTE_MASK));
         objectToReadInto.setGeneratingProcessIdNumber((short)(values[POSITION_PDS_GENERATING_PROCESS_NUMBER+headerOffSet] & BytesToPrimitiveHelper.BYTE_MASK));
diff --git a/src/main/java/org/meteogroup/griblibrary/grib1/Grib1RecordReader.java b/src/main/java/org/meteogroup/griblibrary/grib1/Grib1RecordReader.java
index c20b28e..30c42b4 100644
--- a/src/main/java/org/meteogroup/griblibrary/grib1/Grib1RecordReader.java
+++ b/src/main/java/org/meteogroup/griblibrary/grib1/Grib1RecordReader.java
@@ -72,10 +72,10 @@ public int readRecordLength(byte[] bufferValues) throws GribReaderException {
     public Grib1Record readCompleteRecord(Grib1Record grib1Record, byte[] bufferValues, int headerOffSet) throws BinaryNumberConversionException, GribReaderException  {
         Grib1PDS pds = pdsReader.readPDSValues(bufferValues, headerOffSet);
         grib1Record.setPds(pds);
-        headerOffSet+=pds.getPdsLenght();
+        headerOffSet+=pds.getPdsLength();
         Grib1GDS gds = gdsReader.readGDSValues(bufferValues, headerOffSet);
         grib1Record.setGds(gds);
-        headerOffSet += gds.getGdsLenght();
+        headerOffSet += gds.getGdsLength();
         Grib1BDS bds = bdsReader.readBDSValues(bufferValues,headerOffSet);
         grib1Record.setBds(bds);
         this.checkIfGribFileEndsValid(bufferValues);
diff --git a/src/main/java/org/meteogroup/griblibrary/grib1/model/Grib1GDS.java b/src/main/java/org/meteogroup/griblibrary/grib1/model/Grib1GDS.java
index e839569..6d94b03 100644
--- a/src/main/java/org/meteogroup/griblibrary/grib1/model/Grib1GDS.java
+++ b/src/main/java/org/meteogroup/griblibrary/grib1/model/Grib1GDS.java
@@ -15,7 +15,7 @@
 @ToString(exclude = {"latLons", "pointsAlongLatitudeCircleForGaussian"})
 public class Grib1GDS {
 
-    private int gdsLenght;
+    private int gdsLength;
     private int numberOfVerticalsCoordinateParams;
     private int locationOfVerticalCoordinateParams;
     private int locationListPer;
diff --git a/src/main/java/org/meteogroup/griblibrary/grib1/model/Grib1PDS.java b/src/main/java/org/meteogroup/griblibrary/grib1/model/Grib1PDS.java
index 17e68ab..7acd0ea 100644
--- a/src/main/java/org/meteogroup/griblibrary/grib1/model/Grib1PDS.java
+++ b/src/main/java/org/meteogroup/griblibrary/grib1/model/Grib1PDS.java
@@ -14,7 +14,7 @@
 @ToString
 public class Grib1PDS {
 
-    private int pdsLenght;
+    private int pdsLength;
 
     private int parameterTableVersionNumber;
     private int identificationOfCentre;
diff --git a/src/test/java/org/meteogroup/griblibrary/grib1/Grib1GDSReaderTest.java b/src/test/java/org/meteogroup/griblibrary/grib1/Grib1GDSReaderTest.java
index 641157a..68a61a3 100644
--- a/src/test/java/org/meteogroup/griblibrary/grib1/Grib1GDSReaderTest.java
+++ b/src/test/java/org/meteogroup/griblibrary/grib1/Grib1GDSReaderTest.java
@@ -94,7 +94,7 @@ public void testGaussianReadout(Grib1GDS objectToWriteInto, byte[] inputValues,
 
 	private static final Grib1GDS GOOD_GDS_OBJECT(){
 		Grib1GDS gds = new Grib1GDS();
-		gds.setGdsLenght(2592);
+		gds.setGdsLength(2592);
 		gds.setNumberOfVerticalsCoordinateParams(0);
 		gds.setLocationOfVerticalCoordinateParams(33);
 		gds.setLocationListPer(0);
diff --git a/src/test/java/org/meteogroup/griblibrary/grib1/Grib1PDSReaderTest.java b/src/test/java/org/meteogroup/griblibrary/grib1/Grib1PDSReaderTest.java
index ed549a6..443f332 100644
--- a/src/test/java/org/meteogroup/griblibrary/grib1/Grib1PDSReaderTest.java
+++ b/src/test/java/org/meteogroup/griblibrary/grib1/Grib1PDSReaderTest.java
@@ -54,7 +54,7 @@ public void testReadPDS(byte[] testArray, int headerOffSet, Grib1PDS expectedRes
 
     private static final Grib1PDS GOOD_PDS_OBJECT(){
         Grib1PDS pds = new Grib1PDS();
-        pds.setPdsLenght(28);
+        pds.setPdsLength(28);
         pds.setParameterTableVersionNumber(128);
         pds.setIdentificationOfCentre(98);
         pds.setGeneratingProcessIdNumber(145);
diff --git a/src/test/java/org/meteogroup/griblibrary/grib1/Grib1RecordReaderTest.java b/src/test/java/org/meteogroup/griblibrary/grib1/Grib1RecordReaderTest.java
index e8d0d73..90cf359 100644
--- a/src/test/java/org/meteogroup/griblibrary/grib1/Grib1RecordReaderTest.java
+++ b/src/test/java/org/meteogroup/griblibrary/grib1/Grib1RecordReaderTest.java
@@ -135,13 +135,13 @@ public void testReadOutCoordination() throws Exception {
 
     private static final Grib1PDS LENGTH_ONLY_PDS(){
         Grib1PDS pds = new Grib1PDS();
-        pds.setPdsLenght(8);
+        pds.setPdsLength(8);
         return pds;
     }
 
     private static final Grib1GDS LENGTH_ONLY_GDS(){
         Grib1GDS gds = new Grib1GDS();
-        gds.setGdsLenght(8);
+        gds.setGdsLength(8);
         return gds;
     }