diff --git a/ocpp-v1_6-test/src/main/java/eu/chargetime/ocpp/test/FakeCentralSystem.java b/ocpp-v1_6-test/src/main/java/eu/chargetime/ocpp/test/FakeCentralSystem.java
index d11670182..a289c2676 100644
--- a/ocpp-v1_6-test/src/main/java/eu/chargetime/ocpp/test/FakeCentralSystem.java
+++ b/ocpp-v1_6-test/src/main/java/eu/chargetime/ocpp/test/FakeCentralSystem.java
@@ -320,8 +320,8 @@ public void sendSendLocalListRequest(int listVersion, UpdateType updateType) thr
         send(request);
     }
 
-    public void sendSetChargingProfileRequest(Integer connectorId, ChargingProfile chargingProfile) throws Exception {
-        SetChargingProfileRequest request = new SetChargingProfileRequest(connectorId,  chargingProfile);
+    public void sendSetChargingProfileRequest(Integer connectorId, ChargingProfile csChargingProfiles) throws Exception {
+        SetChargingProfileRequest request = new SetChargingProfileRequest(connectorId,  csChargingProfiles);
         send(request);
     }
 
diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/profile/ServerSmartChargingProfile.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/profile/ServerSmartChargingProfile.java
index f48292faa..e72ec7a68 100644
--- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/profile/ServerSmartChargingProfile.java
+++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/profile/ServerSmartChargingProfile.java
@@ -58,7 +58,7 @@ public Confirmation handleRequest(UUID sessionIndex, Request request) {
     public SetChargingProfileRequest createSetChargingProfileRequest(int connectorId, ChargingProfile profile) {
         SetChargingProfileRequest request = new SetChargingProfileRequest();
         request.setConnectorId(connectorId);
-        request.setChargingProfile(profile);
+        request.setCsChargingProfiles(profile);
         return request;
     }
 }
diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/smartcharging/SetChargingProfileRequest.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/smartcharging/SetChargingProfileRequest.java
index 5b5eeb973..5a84d1af1 100644
--- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/smartcharging/SetChargingProfileRequest.java
+++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/smartcharging/SetChargingProfileRequest.java
@@ -39,14 +39,14 @@
 @XmlRootElement
 public class SetChargingProfileRequest implements Request {
     private Integer connectorId;
-    private ChargingProfile chargingProfile;
+    private ChargingProfile csChargingProfiles;
 
     public SetChargingProfileRequest() {
     }
 
-    public SetChargingProfileRequest(Integer connectorId, ChargingProfile chargingProfile) {
+    public SetChargingProfileRequest(Integer connectorId, ChargingProfile csChargingProfiles) {
         this.connectorId = connectorId;
-        this.chargingProfile = chargingProfile;
+        this.csChargingProfiles = csChargingProfiles;
     }
 
     /**
@@ -77,19 +77,19 @@ public void setConnectorId(Integer connectorId) {
      *
      * @return the {@link ChargingProfile}.
      */
-    public ChargingProfile getChargingProfile() {
-        return chargingProfile;
+    public ChargingProfile getCsChargingProfiles() {
+        return csChargingProfiles;
     }
 
     /**
      * Optional. Charging Profile to be used by the Charge Point for the requested transaction.
      * {@link ChargingProfile#setChargingProfilePurpose(ChargingProfilePurposeType)} MUST be set to TxProfile.
      *
-     * @param chargingProfile the {@link ChargingProfile}.
+     * @param csChargingProfiles the {@link ChargingProfile}.
      */
     @XmlElement(name = "csChargingProfiles")
-    public void setChargingProfile(ChargingProfile chargingProfile) {
-        this.chargingProfile = chargingProfile;
+    public void setCsChargingProfiles(ChargingProfile csChargingProfiles) {
+        this.csChargingProfiles = csChargingProfiles;
     }
 
     @Override
@@ -101,8 +101,8 @@ public boolean transactionRelated() {
     public boolean validate() {
         boolean valid = connectorId != null && connectorId > 0;
 
-        if (chargingProfile != null) {
-            valid &= chargingProfile.validate();
+        if (csChargingProfiles != null) {
+            valid &= csChargingProfiles.validate();
         }
 
         return valid;
@@ -115,19 +115,19 @@ public boolean equals(Object o) {
         if (o == null || getClass() != o.getClass()) return false;
         SetChargingProfileRequest that = (SetChargingProfileRequest) o;
         return Objects.equals(connectorId, that.connectorId) &&
-                Objects.equals(chargingProfile, that.chargingProfile);
+                Objects.equals(csChargingProfiles, that.csChargingProfiles);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(connectorId, chargingProfile);
+        return Objects.hash(connectorId, csChargingProfiles);
     }
 
     @Override
     public String toString() {
         return MoreObjects.toStringHelper(this)
                 .add("connectorId", connectorId)
-                .add("chargingProfile", chargingProfile)
+                .add("csChargingProfiles", csChargingProfiles)
                 .add("isValid", validate())
                 .toString();
     }
diff --git a/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ServerSmartChargingProfileTest.java b/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ServerSmartChargingProfileTest.java
index 951a7db6b..646d33a9d 100644
--- a/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ServerSmartChargingProfileTest.java
+++ b/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ServerSmartChargingProfileTest.java
@@ -93,7 +93,7 @@ public void createSetChargingProfileRequest_returnsValidSetChargingProfileReques
         assertThat(result.validate(), is(true));
         assertThat(result.getConnectorId(), is(connectorId));
 
-        ChargingProfile resultProfile = result.getChargingProfile();
+        ChargingProfile resultProfile = result.getCsChargingProfiles();
         assertThat(profile, is(resultProfile));
 
     }