diff --git a/readme.md b/readme.md
index f3fcb4cd..f2d1c859 100644
--- a/readme.md
+++ b/readme.md
@@ -224,7 +224,7 @@ Details about a signed document
 |----|----|--------|-----------|
 |parcelId|String|yes|The id of the parcel in posten|
 |parcelUUID|String|yes|The uuid of the parcel|
-|barcode|Barcode|yes|Bar code|
+|barcode|Barcode|yes|Barcode|
 |productName|String|yes|Mail Service product name|
 |arrivalDateTime|ZonedDateTime|yes|ISO8601 full DateTime for arrival at pickup place|
 |returnDateTime|ZonedDateTime|yes|ISO8601 full DateTime for return back to sender|
@@ -240,7 +240,7 @@ Details about a signed document
 |----|----|--------|-----------|
 |digipostAddress|String|yes|The digipost address for the recipient|
 |address|Address|no||
-|emailAdress|String|no||
+|emailAddress|String|no||
 
 ### Sender
 
@@ -273,7 +273,7 @@ Details about a signed document
 
 |Name|Type|Required|Description|
 |----|----|--------|-----------|
-|value|BigDecimal|yes|The value of the parcel in NOK|
+|packageValue|BigDecimal|yes|The value of the parcel in NOK|
 |payedCustomsFee|BigDecimal|yes|payed fee in customs|
 |vasText|String|yes|Text from custums|
 
@@ -284,10 +284,10 @@ Details about a signed document
 <pickupNotice xmlns="http://api.digipost.no/schema/datatypes">
     <parcel-id>KB432788293NO</parcel-id>
     <parcel-uuid>70300492517312675</parcel-uuid>
-    <bar-code>
+    <barcode>
         <barcode-value>1234567890</barcode-value>
         <barcode-type>EAN-128</barcode-type>
-    </bar-code>
+    </barcode>
     <product-name>Klimanøytral Servicepakke</product-name>
     <arrival-date-time>2018-09-10T10:00:00+02:00</arrival-date-time>
     <return-date-time>2018-09-24T10:00:00+02:00</return-date-time>
@@ -324,13 +324,13 @@ Details about a signed document
         </address>
     </pickup-place>
     <package>
-        <lenght>120</lenght>
+        <length>120</length>
         <width>60</width>
         <height>60</height>
         <weight>35000</weight>
     </package>
     <customs>
-        <value>1277.00</value>
+        <package-value>1277.00</package-value>
         <payed-customs-fee>162.00</payed-customs-fee>
         <vas-text>FORENKLET TOLLBEHANDLING</vas-text>
     </customs>
diff --git a/src/main/java/no/digipost/api/datatypes/types/pickup/Customs.java b/src/main/java/no/digipost/api/datatypes/types/pickup/Customs.java
index 41fa0ef1..c90fbcb5 100644
--- a/src/main/java/no/digipost/api/datatypes/types/pickup/Customs.java
+++ b/src/main/java/no/digipost/api/datatypes/types/pickup/Customs.java
@@ -18,9 +18,9 @@
 @Wither
 public class Customs {
 
-    @XmlElement(name = "value", required = true)
+    @XmlElement(name = "package-value", required = true)
     @Description("The value of the parcel in NOK")
-    BigDecimal value;
+    BigDecimal packageValue;
     
     @XmlElement(name = "payed-customs-fee", required = true)
     @Description("payed fee in customs")
diff --git a/src/main/java/no/digipost/api/datatypes/types/pickup/Package.java b/src/main/java/no/digipost/api/datatypes/types/pickup/Package.java
index 43fc600b..c0d68406 100644
--- a/src/main/java/no/digipost/api/datatypes/types/pickup/Package.java
+++ b/src/main/java/no/digipost/api/datatypes/types/pickup/Package.java
@@ -17,7 +17,7 @@
 @Wither
 public class Package {
 
-    @XmlElement(name = "lenght")
+    @XmlElement(name = "length")
     @Description("Package lenght in cm")
     Integer length;
 
diff --git a/src/main/java/no/digipost/api/datatypes/types/pickup/PickupNotice.java b/src/main/java/no/digipost/api/datatypes/types/pickup/PickupNotice.java
index 6db8afa5..f2ab94a7 100644
--- a/src/main/java/no/digipost/api/datatypes/types/pickup/PickupNotice.java
+++ b/src/main/java/no/digipost/api/datatypes/types/pickup/PickupNotice.java
@@ -34,8 +34,8 @@ public class PickupNotice implements DataType {
     @Description("The uuid of the parcel")
     String parcelUUID;
     
-    @XmlElement(name = "bar-code", required = true)
-    @Description("Bar code")
+    @XmlElement(name = "barcode", required = true)
+    @Description("Barcode")
     Barcode barcode;
     
     @XmlElement(name = "product-name", required = true)
diff --git a/src/main/java/no/digipost/api/datatypes/types/pickup/Recipient.java b/src/main/java/no/digipost/api/datatypes/types/pickup/Recipient.java
index d81e3e62..15cb5c70 100644
--- a/src/main/java/no/digipost/api/datatypes/types/pickup/Recipient.java
+++ b/src/main/java/no/digipost/api/datatypes/types/pickup/Recipient.java
@@ -26,7 +26,7 @@ public class Recipient {
     Address address;
 
     @XmlElement(name = "email-address")
-    String emailAdress;
+    String emailAddress;
     
     public static final Recipient EXAMPLE = new Recipient("test.testesen#0000", Address.EXAMPLE, "test.testesen@example.com");