diff --git a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorAspect.java b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorAspect.java
index 21cb176cb29..be954efd483 100644
--- a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorAspect.java
+++ b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorAspect.java
@@ -17,7 +17,6 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.sonyprojector.internal.SonyProjectorException;
 import org.openhab.core.types.StateOption;
 import org.openhab.core.util.HexUtils;
@@ -32,55 +31,54 @@ public enum SonyProjectorAspect {
 
     // Category 1: VW260, VW270, VW285, VW295, VW300, VW315, VW320, VW328, VW350, VW365, VW385, VW500, VW515, VW520,
     // VW528, VW550, VW570, VW600, VW665, VW675, VW695, VW760, VW885
-    CAT1_NORMAL(1, "Normal", null, new byte[] { 0x00, 0x01 }),
-    CAT1_V_STRETCH(1, "VStretch", "V Stretch", new byte[] { 0x00, 0x0B }),
-    CAT1_185(1, "185", "1.85:1 Zoom", new byte[] { 0x00, 0x0C }),
-    CAT1_235(1, "235", "2.35:1 Zoom", new byte[] { 0x00, 0x0D }),
-    CAT1_STRETCH(1, "Stretch", null, new byte[] { 0x00, 0x0E }),
-    CAT1_SQUEEZE(1, "Squeeze", null, new byte[] { 0x00, 0x0F }),
+    CAT1_NORMAL(1, "Normal", new byte[] { 0x00, 0x01 }),
+    CAT1_V_STRETCH(1, "VStretch", new byte[] { 0x00, 0x0B }),
+    CAT1_185(1, "185", new byte[] { 0x00, 0x0C }),
+    CAT1_235(1, "235", new byte[] { 0x00, 0x0D }),
+    CAT1_STRETCH(1, "Stretch", new byte[] { 0x00, 0x0E }),
+    CAT1_SQUEEZE(1, "Squeeze", new byte[] { 0x00, 0x0F }),
 
     // Category 2: VW40, VW50, HW10, HW15, HW20, HW30
-    CAT2_FULL(2, "Full", null, new byte[] { 0x00, 0x00 }),
-    CAT2_NORMAL(2, "Normal", null, new byte[] { 0x00, 0x01 }),
-    CAT2_WIDE(2, "WideZoom", "Wide Zoom", new byte[] { 0x00, 0x02 }),
-    CAT2_ZOOM(2, "Zoom", null, new byte[] { 0x00, 0x03 }),
-    CAT2_FULL1(2, "Full1", "Full 1", new byte[] { 0x00, 0x07 }),
-    CAT2_FULL2(2, "Full2", "Full 2", new byte[] { 0x00, 0x08 }),
+    CAT2_FULL(2, "Full", new byte[] { 0x00, 0x00 }),
+    CAT2_NORMAL(2, "Normal", new byte[] { 0x00, 0x01 }),
+    CAT2_WIDE(2, "WideZoom", new byte[] { 0x00, 0x02 }),
+    CAT2_ZOOM(2, "Zoom", new byte[] { 0x00, 0x03 }),
+    CAT2_FULL1(2, "Full1", new byte[] { 0x00, 0x07 }),
+    CAT2_FULL2(2, "Full2", new byte[] { 0x00, 0x08 }),
 
     // Category 3: VW60, VW70, VW80, VW85, VW90, VW95, VW200
-    CAT3_FULL(3, "Full", null, new byte[] { 0x00, 0x00 }),
-    CAT3_NORMAL(3, "Normal", null, new byte[] { 0x00, 0x01 }),
-    CAT3_WIDE(3, "WideZoom", "Wide Zoom", new byte[] { 0x00, 0x02 }),
-    CAT3_ZOOM(3, "Zoom", null, new byte[] { 0x00, 0x03 }),
-    CAT3_FULL1(3, "Full1", "Full 1", new byte[] { 0x00, 0x07 }),
-    CAT3_FULL2(3, "Full2", "Full 2", new byte[] { 0x00, 0x08 }),
-    CAT3_ANAMORPHIC(3, "Anamorphic", null, new byte[] { 0x00, 0x0B }),
+    CAT3_FULL(3, "Full", new byte[] { 0x00, 0x00 }),
+    CAT3_NORMAL(3, "Normal", new byte[] { 0x00, 0x01 }),
+    CAT3_WIDE(3, "WideZoom", new byte[] { 0x00, 0x02 }),
+    CAT3_ZOOM(3, "Zoom", new byte[] { 0x00, 0x03 }),
+    CAT3_FULL1(3, "Full1", new byte[] { 0x00, 0x07 }),
+    CAT3_FULL2(3, "Full2", new byte[] { 0x00, 0x08 }),
+    CAT3_ANAMORPHIC(3, "Anamorphic", new byte[] { 0x00, 0x0B }),
 
     // Category 4: VW100
-    CAT4_FULL(4, "Full", null, new byte[] { 0x00, 0x00 }),
-    CAT4_NORMAL(4, "Normal", null, new byte[] { 0x00, 0x01 }),
-    CAT4_WIDE(4, "WideZoom", "Wide Zoom", new byte[] { 0x00, 0x02 }),
-    CAT4_ZOOM(4, "Zoom", null, new byte[] { 0x00, 0x03 }),
-    CAT3_SUBTITLE(4, "Subtitle", null, new byte[] { 0x00, 0x04 }),
+    CAT4_FULL(4, "Full", new byte[] { 0x00, 0x00 }),
+    CAT4_NORMAL(4, "Normal", new byte[] { 0x00, 0x01 }),
+    CAT4_WIDE(4, "WideZoom", new byte[] { 0x00, 0x02 }),
+    CAT4_ZOOM(4, "Zoom", new byte[] { 0x00, 0x03 }),
+    CAT3_SUBTITLE(4, "Subtitle", new byte[] { 0x00, 0x04 }),
 
     // Category 5: HW40ES, HW50ES, HW55ES, HW58ES
-    CAT5_FULL(5, "Full", null, new byte[] { 0x00, 0x00 }),
-    CAT5_NORMAL(5, "Normal", null, new byte[] { 0x00, 0x01 }),
-    CAT5_WIDE(5, "WideZoom", "Wide Zoom", new byte[] { 0x00, 0x02 }),
-    CAT5_ZOOM(5, "Zoom", null, new byte[] { 0x00, 0x03 }),
-    CAT5_V_STRETCH(5, "VStretch", "V Stretch", new byte[] { 0x00, 0x0B }),
-    CAT5_STRETCH(5, "Stretch", null, new byte[] { 0x00, 0x0E }),
-    CAT5_SQUEEZE(5, "Squeeze", null, new byte[] { 0x00, 0x0F }),
+    CAT5_FULL(5, "Full", new byte[] { 0x00, 0x00 }),
+    CAT5_NORMAL(5, "Normal", new byte[] { 0x00, 0x01 }),
+    CAT5_WIDE(5, "WideZoom", new byte[] { 0x00, 0x02 }),
+    CAT5_ZOOM(5, "Zoom", new byte[] { 0x00, 0x03 }),
+    CAT5_V_STRETCH(5, "VStretch", new byte[] { 0x00, 0x0B }),
+    CAT5_STRETCH(5, "Stretch", new byte[] { 0x00, 0x0E }),
+    CAT5_SQUEEZE(5, "Squeeze", new byte[] { 0x00, 0x0F }),
 
     // Category 6: HW45ES, HW60, HW65, HW68
-    CAT6_NORMAL(6, "Normal", null, new byte[] { 0x00, 0x01 }),
-    CAT6_V_STRETCH(6, "VStretch", "V Stretch", new byte[] { 0x00, 0x0B }),
-    CAT6_STRETCH(6, "Stretch", null, new byte[] { 0x00, 0x0E }),
-    CAT6_SQUEEZE(6, "Squeeze", null, new byte[] { 0x00, 0x0F });
+    CAT6_NORMAL(6, "Normal", new byte[] { 0x00, 0x01 }),
+    CAT6_V_STRETCH(6, "VStretch", new byte[] { 0x00, 0x0B }),
+    CAT6_STRETCH(6, "Stretch", new byte[] { 0x00, 0x0E }),
+    CAT6_SQUEEZE(6, "Squeeze", new byte[] { 0x00, 0x0F });
 
     private int category;
     private String name;
-    private @Nullable String label;
     private byte[] dataCode;
 
     /**
@@ -88,13 +86,11 @@ public enum SonyProjectorAspect {
      *
      * @param category a category of projector models for which the aspect mode is available
      * @param name the name of the aspect mode
-     * @param label the label of the aspect mode; can be null when the label is identical to the name
      * @param dataCode the data code identifying the aspect mode
      */
-    private SonyProjectorAspect(int category, String name, @Nullable String label, byte[] dataCode) {
+    private SonyProjectorAspect(int category, String name, byte[] dataCode) {
         this.category = category;
         this.name = name;
-        this.label = label;
         this.dataCode = dataCode;
     }
 
@@ -116,15 +112,6 @@ public enum SonyProjectorAspect {
         return dataCode;
     }
 
-    /**
-     * Get the label of the current aspect mode
-     *
-     * @return the label
-     */
-    public @Nullable String getLabel() {
-        return label;
-    }
-
     /**
      * Get the name of the current aspect mode
      *
@@ -147,8 +134,7 @@ public enum SonyProjectorAspect {
         List<StateOption> options = new ArrayList<>();
         for (SonyProjectorAspect value : SonyProjectorAspect.values()) {
             if (value.getCategory() == category) {
-                options.add(new StateOption(value.getName(),
-                        value.getLabel() != null ? value.getLabel() : value.getName()));
+                options.add(new StateOption(value.getName(), value.getName()));
             }
         }
         return options;
diff --git a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorCalibrationPreset.java b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorCalibrationPreset.java
index 877d1ad5f31..b3949ad74b7 100644
--- a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorCalibrationPreset.java
+++ b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorCalibrationPreset.java
@@ -17,7 +17,6 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.sonyprojector.internal.SonyProjectorException;
 import org.openhab.core.types.StateOption;
 import org.openhab.core.util.HexUtils;
@@ -34,57 +33,56 @@ public enum SonyProjectorCalibrationPreset {
     // Category 1: VW260, VW270, VW285, VW295, VW300, VW315, VW320, VW328, VW350, VW365, VW385, VW500, VW515, VW520,
     // VW528, VW550, VW570, VW600, VW665, VW675, VW695, VW760, VW870, VW885, VW995, HW40ES, HW45ES, HW50ES, HW55ES,
     // HW58ES, HW60, HW65, HW68
-    CAT1_CINEMA_FILM1(1, "Film1", "Cinema Film 1", new byte[] { 0x00, 0x00 }),
-    CAT1_CINEMA_FILM2(1, "Film2", "Cinema Film 2", new byte[] { 0x00, 0x01 }),
-    CAT1_REFERENCE(1, "Reference", null, new byte[] { 0x00, 0x02 }),
-    CAT1_TV(1, "TV", null, new byte[] { 0x00, 0x03 }),
-    CAT1_PHOTO(1, "Photo", null, new byte[] { 0x00, 0x04 }),
-    CAT1_GAME(1, "Game", null, new byte[] { 0x00, 0x05 }),
-    CAT1_BRT_CINE(1, "BRTCINE", "Bright Cinema", new byte[] { 0x00, 0x06 }),
-    CAT1_BRT_TV(1, "BRTTV", "Bright TV", new byte[] { 0x00, 0x07 }),
-    CAT1_USER(1, "User", null, new byte[] { 0x00, 0x08 }),
+    CAT1_CINEMA_FILM1(1, "Film1", new byte[] { 0x00, 0x00 }),
+    CAT1_CINEMA_FILM2(1, "Film2", new byte[] { 0x00, 0x01 }),
+    CAT1_REFERENCE(1, "Reference", new byte[] { 0x00, 0x02 }),
+    CAT1_TV(1, "TV", new byte[] { 0x00, 0x03 }),
+    CAT1_PHOTO(1, "Photo", new byte[] { 0x00, 0x04 }),
+    CAT1_GAME(1, "Game", new byte[] { 0x00, 0x05 }),
+    CAT1_BRT_CINE(1, "BRTCINE", new byte[] { 0x00, 0x06 }),
+    CAT1_BRT_TV(1, "BRTTV", new byte[] { 0x00, 0x07 }),
+    CAT1_USER(1, "User", new byte[] { 0x00, 0x08 }),
 
     // Category 2: VW40, VW50, VW60, VW70, VW80, VW100, VW200, HW10, HW15, HW20
-    CAT2_DYNAMIC(2, "Dynamic", null, new byte[] { 0x00, 0x00 }),
-    CAT2_STANDARD(2, "Standard", null, new byte[] { 0x00, 0x01 }),
-    CAT2_CINEMA(2, "Cinema", null, new byte[] { 0x00, 0x02 }),
-    CAT2_USER1(2, "User1", "User 1", new byte[] { 0x00, 0x03 }),
-    CAT2_USER2(2, "User2", "User 2", new byte[] { 0x00, 0x04 }),
-    CAT2_USER3(2, "User3", "User 3", new byte[] { 0x00, 0x05 }),
+    CAT2_DYNAMIC(2, "Dynamic", new byte[] { 0x00, 0x00 }),
+    CAT2_STANDARD(2, "Standard", new byte[] { 0x00, 0x01 }),
+    CAT2_CINEMA(2, "Cinema", new byte[] { 0x00, 0x02 }),
+    CAT2_USER1(2, "User1", new byte[] { 0x00, 0x03 }),
+    CAT2_USER2(2, "User2", new byte[] { 0x00, 0x04 }),
+    CAT2_USER3(2, "User3", new byte[] { 0x00, 0x05 }),
 
     // Category 3: VW85, VW90
-    CAT3_DYNAMIC(3, "Dynamic", null, new byte[] { 0x00, 0x00 }),
-    CAT3_STANDARD(3, "Standard", null, new byte[] { 0x00, 0x01 }),
-    CAT3_CINEMA1(3, "Cinema1", "Cinema 1", new byte[] { 0x00, 0x02 }),
-    CAT3_CINEMA2(3, "Cinema2", "Cinema 2", new byte[] { 0x00, 0x03 }),
-    CAT3_CINEMA3(3, "Cinema3", "Cinema 3", new byte[] { 0x00, 0x04 }),
-    CAT3_USER(3, "User", null, new byte[] { 0x00, 0x05 }),
+    CAT3_DYNAMIC(3, "Dynamic", new byte[] { 0x00, 0x00 }),
+    CAT3_STANDARD(3, "Standard", new byte[] { 0x00, 0x01 }),
+    CAT3_CINEMA1(3, "Cinema1", new byte[] { 0x00, 0x02 }),
+    CAT3_CINEMA2(3, "Cinema2", new byte[] { 0x00, 0x03 }),
+    CAT3_CINEMA3(3, "Cinema3", new byte[] { 0x00, 0x04 }),
+    CAT3_USER(3, "User", new byte[] { 0x00, 0x05 }),
 
     // Category 4: VW95, HW30ES
-    CAT4_DYNAMIC(4, "Dynamic", null, new byte[] { 0x00, 0x00 }),
-    CAT4_STANDARD(4, "Standard", null, new byte[] { 0x00, 0x01 }),
-    CAT4_CINEMA1(4, "Cinema1", "Cinema 1", new byte[] { 0x00, 0x02 }),
-    CAT4_CINEMA2(4, "Cinema2", "Cinema 2", new byte[] { 0x00, 0x03 }),
-    CAT4_CINEMA3(4, "Cinema3", "Cinema 3", new byte[] { 0x00, 0x04 }),
-    CAT4_GAME(4, "Game", null, new byte[] { 0x00, 0x05 }),
-    CAT4_PHOTO(4, "Photo", null, new byte[] { 0x00, 0x06 }),
-    CAT4_USER1(4, "User1", "User 1", new byte[] { 0x00, 0x07 }),
-    CAT4_USER2(4, "User2", "User 2", new byte[] { 0x00, 0x08 }),
+    CAT4_DYNAMIC(4, "Dynamic", new byte[] { 0x00, 0x00 }),
+    CAT4_STANDARD(4, "Standard", new byte[] { 0x00, 0x01 }),
+    CAT4_CINEMA1(4, "Cinema1", new byte[] { 0x00, 0x02 }),
+    CAT4_CINEMA2(4, "Cinema2", new byte[] { 0x00, 0x03 }),
+    CAT4_CINEMA3(4, "Cinema3", new byte[] { 0x00, 0x04 }),
+    CAT4_GAME(4, "Game", new byte[] { 0x00, 0x05 }),
+    CAT4_PHOTO(4, "Photo", new byte[] { 0x00, 0x06 }),
+    CAT4_USER1(4, "User1", new byte[] { 0x00, 0x07 }),
+    CAT4_USER2(4, "User2", new byte[] { 0x00, 0x08 }),
 
     // Category 5: VW1000ES, VW1100ES
-    CAT5_CINEMA_FILM1(5, "Film1", "Cinema Film 1", new byte[] { 0x00, 0x00 }),
-    CAT5_CINEMA_FILM2(5, "Film2", "Cinema Film 2", new byte[] { 0x00, 0x01 }),
-    CAT5_CINEMA_DIGITAL(5, "Digital", "Cinema Digital", new byte[] { 0x00, 0x02 }),
-    CAT5_REFERENCE(5, "Reference", null, new byte[] { 0x00, 0x03 }),
-    CAT5_TV(5, "TV", null, new byte[] { 0x00, 0x04 }),
-    CAT5_PHOTO(5, "Photo", null, new byte[] { 0x00, 0x05 }),
-    CAT5_GAME(5, "Game", null, new byte[] { 0x00, 0x06 }),
-    CAT5_BRT_CINE(5, "BRTCINE", "Bright Cinema", new byte[] { 0x00, 0x07 }),
-    CAT5_BRT_TV(5, "BRTTV", "Bright TV", new byte[] { 0x00, 0x08 });
+    CAT5_CINEMA_FILM1(5, "Film1", new byte[] { 0x00, 0x00 }),
+    CAT5_CINEMA_FILM2(5, "Film2", new byte[] { 0x00, 0x01 }),
+    CAT5_CINEMA_DIGITAL(5, "Digital", new byte[] { 0x00, 0x02 }),
+    CAT5_REFERENCE(5, "Reference", new byte[] { 0x00, 0x03 }),
+    CAT5_TV(5, "TV", new byte[] { 0x00, 0x04 }),
+    CAT5_PHOTO(5, "Photo", new byte[] { 0x00, 0x05 }),
+    CAT5_GAME(5, "Game", new byte[] { 0x00, 0x06 }),
+    CAT5_BRT_CINE(5, "BRTCINE", new byte[] { 0x00, 0x07 }),
+    CAT5_BRT_TV(5, "BRTTV", new byte[] { 0x00, 0x08 });
 
     private int category;
     private String name;
-    private @Nullable String label;
     private byte[] dataCode;
 
     /**
@@ -92,13 +90,11 @@ public enum SonyProjectorCalibrationPreset {
      *
      * @param category a category of projector models for which the calibration preset is available
      * @param name the name of the calibration preset
-     * @param label the label of the calibration preset; can be null when the label is identical to the name
      * @param dataCode the data code identifying the calibration preset
      */
-    private SonyProjectorCalibrationPreset(int category, String name, @Nullable String label, byte[] dataCode) {
+    private SonyProjectorCalibrationPreset(int category, String name, byte[] dataCode) {
         this.category = category;
         this.name = name;
-        this.label = label;
         this.dataCode = dataCode;
     }
 
@@ -120,15 +116,6 @@ public enum SonyProjectorCalibrationPreset {
         return dataCode;
     }
 
-    /**
-     * Get the label of the current calibration preset
-     *
-     * @return the label
-     */
-    public @Nullable String getLabel() {
-        return label;
-    }
-
     /**
      * Get the name of the current calibration preset
      *
@@ -151,8 +138,7 @@ public enum SonyProjectorCalibrationPreset {
         List<StateOption> options = new ArrayList<>();
         for (SonyProjectorCalibrationPreset value : SonyProjectorCalibrationPreset.values()) {
             if (value.getCategory() == category) {
-                options.add(new StateOption(value.getName(),
-                        value.getLabel() != null ? value.getLabel() : value.getName()));
+                options.add(new StateOption(value.getName(), value.getName()));
             }
         }
         return options;
diff --git a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorColorSpace.java b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorColorSpace.java
index fe7f983e10e..c8e2d774564 100644
--- a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorColorSpace.java
+++ b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorColorSpace.java
@@ -17,7 +17,6 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.sonyprojector.internal.SonyProjectorException;
 import org.openhab.core.types.StateOption;
 import org.openhab.core.util.HexUtils;
@@ -31,48 +30,47 @@ import org.openhab.core.util.HexUtils;
 public enum SonyProjectorColorSpace {
 
     // Category 1: VW300, VW315, VW320, VW328, VW350, VW365, VW500, VW600, HW60, HW65, HW68
-    CAT1_BT709(1, "BT709", "BT.709", new byte[] { 0x00, 0x00 }),
-    CAT1_SPACE1(1, "ColorSpace1", "Color Space 1", new byte[] { 0x00, 0x03 }),
-    CAT1_SPACE2(1, "ColorSpace2", "Color Space 2", new byte[] { 0x00, 0x04 }),
-    CAT1_SPACE3(1, "ColorSpace3", "Color Space 3", new byte[] { 0x00, 0x05 }),
-    CAT1_CUSTOM(1, "Custom", null, new byte[] { 0x00, 0x06 }),
+    CAT1_BT709(1, "BT709", new byte[] { 0x00, 0x00 }),
+    CAT1_SPACE1(1, "ColorSpace1", new byte[] { 0x00, 0x03 }),
+    CAT1_SPACE2(1, "ColorSpace2", new byte[] { 0x00, 0x04 }),
+    CAT1_SPACE3(1, "ColorSpace3", new byte[] { 0x00, 0x05 }),
+    CAT1_CUSTOM(1, "Custom", new byte[] { 0x00, 0x06 }),
 
     // Category 2: VW260, VW270, VW285, VW295, VW385, VW515, VW520, VW528, VW550, VW570, VW665, VW675, VW695, VW760,
     // VW870, VW885, VW995
-    CAT2_BT709(2, "BT709", "BT.709", new byte[] { 0x00, 0x00 }),
-    CAT2_BT2020(2, "BT2020", "BT.2020", new byte[] { 0x00, 0x08 }),
-    CAT2_SPACE1(2, "ColorSpace1", "Color Space 1", new byte[] { 0x00, 0x03 }),
-    CAT2_SPACE2(2, "ColorSpace2", "Color Space 2", new byte[] { 0x00, 0x04 }),
-    CAT2_SPACE3(2, "ColorSpace3", "Color Space 3", new byte[] { 0x00, 0x05 }),
-    CAT2_CUSTOM(2, "Custom", null, new byte[] { 0x00, 0x06 }),
+    CAT2_BT709(2, "BT709", new byte[] { 0x00, 0x00 }),
+    CAT2_BT2020(2, "BT2020", new byte[] { 0x00, 0x08 }),
+    CAT2_SPACE1(2, "ColorSpace1", new byte[] { 0x00, 0x03 }),
+    CAT2_SPACE2(2, "ColorSpace2", new byte[] { 0x00, 0x04 }),
+    CAT2_SPACE3(2, "ColorSpace3", new byte[] { 0x00, 0x05 }),
+    CAT2_CUSTOM(2, "Custom", new byte[] { 0x00, 0x06 }),
 
     // Category 3: VW40, VW50, VW60, VW70, VW80, VW100, VW200, HW10, HW15, HW20
-    CAT3_NORMAL(3, "Normal", null, new byte[] { 0x00, 0x00 }),
-    CAT3_WIDE(3, "Wide", null, new byte[] { 0x00, 0x01 }),
+    CAT3_NORMAL(3, "Normal", new byte[] { 0x00, 0x00 }),
+    CAT3_WIDE(3, "Wide", new byte[] { 0x00, 0x01 }),
 
     // Category 4: VW85, VW90, VW95, HW30ES
-    CAT4_NORMAL(4, "Normal", null, new byte[] { 0x00, 0x00 }),
-    CAT4_WIDE1(4, "Wide1", "Wide 1", new byte[] { 0x00, 0x01 }),
-    CAT4_WIDE2(4, "Wide2", "Wide 2", new byte[] { 0x00, 0x02 }),
-    CAT4_WIDE3(4, "Wide3", "Wide 3", new byte[] { 0x00, 0x03 }),
+    CAT4_NORMAL(4, "Normal", new byte[] { 0x00, 0x00 }),
+    CAT4_WIDE1(4, "Wide1", new byte[] { 0x00, 0x01 }),
+    CAT4_WIDE2(4, "Wide2", new byte[] { 0x00, 0x02 }),
+    CAT4_WIDE3(4, "Wide3", new byte[] { 0x00, 0x03 }),
 
     // Category 5: VW1000ES, VW1100ES
-    CAT5_BT709(5, "BT709", "BT.709", new byte[] { 0x00, 0x00 }),
-    CAT5_DCI(5, "DCI", null, new byte[] { 0x00, 0x01 }),
-    CAT5_ADOBE_RGB(5, "AdobeRGB", "Adobe RGB", new byte[] { 0x00, 0x02 }),
-    CAT5_SPACE1(5, "ColorSpace1", "Color Space 1", new byte[] { 0x00, 0x03 }),
-    CAT5_SPACE2(5, "ColorSpace2", "Color Space 2", new byte[] { 0x00, 0x04 }),
-    CAT5_SPACE3(5, "ColorSpace3", "Color Space 3", new byte[] { 0x00, 0x05 }),
+    CAT5_BT709(5, "BT709", new byte[] { 0x00, 0x00 }),
+    CAT5_DCI(5, "DCI", new byte[] { 0x00, 0x01 }),
+    CAT5_ADOBE_RGB(5, "AdobeRGB", new byte[] { 0x00, 0x02 }),
+    CAT5_SPACE1(5, "ColorSpace1", new byte[] { 0x00, 0x03 }),
+    CAT5_SPACE2(5, "ColorSpace2", new byte[] { 0x00, 0x04 }),
+    CAT5_SPACE3(5, "ColorSpace3", new byte[] { 0x00, 0x05 }),
 
     // Category 6: HW35ES, HW40ES, HW45ES, HW50ES, HW55ES, HW58ES
-    CAT6_BT709(6, "BT709", "BT.709", new byte[] { 0x00, 0x00 }),
-    CAT6_SPACE1(6, "ColorSpace1", "Color Space 1", new byte[] { 0x00, 0x01 }),
-    CAT6_SPACE2(6, "ColorSpace2", "Color Space 2", new byte[] { 0x00, 0x02 }),
-    CAT6_SPACE3(6, "ColorSpace3", "Color Space 3", new byte[] { 0x00, 0x03 });
+    CAT6_BT709(6, "BT709", new byte[] { 0x00, 0x00 }),
+    CAT6_SPACE1(6, "ColorSpace1", new byte[] { 0x00, 0x01 }),
+    CAT6_SPACE2(6, "ColorSpace2", new byte[] { 0x00, 0x02 }),
+    CAT6_SPACE3(6, "ColorSpace3", new byte[] { 0x00, 0x03 });
 
     private int category;
     private String name;
-    private @Nullable String label;
     private byte[] dataCode;
 
     /**
@@ -80,13 +78,11 @@ public enum SonyProjectorColorSpace {
      *
      * @param category a category of projector models for which the color space is available
      * @param name the name of the color space
-     * @param label the label of the color space; can be null when the label is identical to the name
      * @param dataCode the data code identifying the color space
      */
-    private SonyProjectorColorSpace(int category, String name, @Nullable String label, byte[] dataCode) {
+    private SonyProjectorColorSpace(int category, String name, byte[] dataCode) {
         this.category = category;
         this.name = name;
-        this.label = label;
         this.dataCode = dataCode;
     }
 
@@ -108,15 +104,6 @@ public enum SonyProjectorColorSpace {
         return dataCode;
     }
 
-    /**
-     * Get the label of the current color space
-     *
-     * @return the label
-     */
-    public @Nullable String getLabel() {
-        return label;
-    }
-
     /**
      * Get the name of the current color space
      *
@@ -139,8 +126,7 @@ public enum SonyProjectorColorSpace {
         List<StateOption> options = new ArrayList<>();
         for (SonyProjectorColorSpace value : SonyProjectorColorSpace.values()) {
             if (value.getCategory() == category) {
-                options.add(new StateOption(value.getName(),
-                        value.getLabel() != null ? value.getLabel() : value.getName()));
+                options.add(new StateOption(value.getName(), value.getName()));
             }
         }
         return options;
diff --git a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorColorTemp.java b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorColorTemp.java
index ea1fab3f226..0ff1654c0dd 100644
--- a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorColorTemp.java
+++ b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorColorTemp.java
@@ -17,7 +17,6 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.sonyprojector.internal.SonyProjectorException;
 import org.openhab.core.types.StateOption;
 import org.openhab.core.util.HexUtils;
@@ -32,77 +31,76 @@ public enum SonyProjectorColorTemp {
 
     // Category 1: VW260, VW270, VW285, VW295, VW300, VW315, VW320, VW328, VW350, VW365, VW385, VW500, VW515, VW520,
     // VW528, VW550, VW570, VW600, VW665, VW675, VW695, VW760, VW870, VW885, VW995, HW60, HW65, HW68
-    CAT1_D93(1, "D93", null, new byte[] { 0x00, 0x00 }),
-    CAT1_D75(1, "D75", null, new byte[] { 0x00, 0x01 }),
-    CAT1_D65(1, "D65", null, new byte[] { 0x00, 0x02 }),
-    CAT1_D55(1, "D55", null, new byte[] { 0x00, 0x09 }),
-    CAT1_CUSTOM1(1, "Custom1", "Custom 1", new byte[] { 0x00, 0x03 }),
-    CAT1_CUSTOM2(1, "Custom2", "Custom 2", new byte[] { 0x00, 0x04 }),
-    CAT1_CUSTOM3(1, "Custom3", "Custom 3", new byte[] { 0x00, 0x05 }),
-    CAT1_CUSTOM4(1, "Custom4", "Custom 4", new byte[] { 0x00, 0x06 }),
-    CAT1_CUSTOM5(1, "Custom5", "Custom 5", new byte[] { 0x00, 0x08 }),
+    CAT1_D93(1, "D93", new byte[] { 0x00, 0x00 }),
+    CAT1_D75(1, "D75", new byte[] { 0x00, 0x01 }),
+    CAT1_D65(1, "D65", new byte[] { 0x00, 0x02 }),
+    CAT1_D55(1, "D55", new byte[] { 0x00, 0x09 }),
+    CAT1_CUSTOM1(1, "Custom1", new byte[] { 0x00, 0x03 }),
+    CAT1_CUSTOM2(1, "Custom2", new byte[] { 0x00, 0x04 }),
+    CAT1_CUSTOM3(1, "Custom3", new byte[] { 0x00, 0x05 }),
+    CAT1_CUSTOM4(1, "Custom4", new byte[] { 0x00, 0x06 }),
+    CAT1_CUSTOM5(1, "Custom5", new byte[] { 0x00, 0x08 }),
 
     // Category 2: VW40, VW50, VW60, VW100, VW200
-    CAT2_HIGH(2, "High", null, new byte[] { 0x00, 0x00 }),
-    CAT2_MIDDLE(2, "Middle", null, new byte[] { 0x00, 0x01 }),
-    CAT2_LOW(2, "Low", null, new byte[] { 0x00, 0x02 }),
-    CAT2_CUSTOM1(2, "Custom1", "Custom 1", new byte[] { 0x00, 0x03 }),
-    CAT2_CUSTOM2(2, "Custom2", "Custom 2", new byte[] { 0x00, 0x04 }),
-    CAT2_CUSTOM3(2, "Custom3", "Custom 3", new byte[] { 0x00, 0x05 }),
+    CAT2_HIGH(2, "High", new byte[] { 0x00, 0x00 }),
+    CAT2_MIDDLE(2, "Middle", new byte[] { 0x00, 0x01 }),
+    CAT2_LOW(2, "Low", new byte[] { 0x00, 0x02 }),
+    CAT2_CUSTOM1(2, "Custom1", new byte[] { 0x00, 0x03 }),
+    CAT2_CUSTOM2(2, "Custom2", new byte[] { 0x00, 0x04 }),
+    CAT2_CUSTOM3(2, "Custom3", new byte[] { 0x00, 0x05 }),
 
     // Category 3: VW70, VW80, HW10, HW15, HW20
-    CAT3_HIGH(3, "High", null, new byte[] { 0x00, 0x00 }),
-    CAT3_MIDDLE(3, "Middle", null, new byte[] { 0x00, 0x01 }),
-    CAT3_LOW(3, "Low", null, new byte[] { 0x00, 0x02 }),
-    CAT3_CUSTOM1(3, "Custom1", "Custom 1", new byte[] { 0x00, 0x03 }),
-    CAT3_CUSTOM2(3, "Custom2", "Custom 2", new byte[] { 0x00, 0x04 }),
-    CAT3_CUSTOM3(3, "Custom3", "Custom 3", new byte[] { 0x00, 0x05 }),
-    CAT3_CUSTOM4(3, "Custom4", "Custom 4", new byte[] { 0x00, 0x06 }),
+    CAT3_HIGH(3, "High", new byte[] { 0x00, 0x00 }),
+    CAT3_MIDDLE(3, "Middle", new byte[] { 0x00, 0x01 }),
+    CAT3_LOW(3, "Low", new byte[] { 0x00, 0x02 }),
+    CAT3_CUSTOM1(3, "Custom1", new byte[] { 0x00, 0x03 }),
+    CAT3_CUSTOM2(3, "Custom2", new byte[] { 0x00, 0x04 }),
+    CAT3_CUSTOM3(3, "Custom3", new byte[] { 0x00, 0x05 }),
+    CAT3_CUSTOM4(3, "Custom4", new byte[] { 0x00, 0x06 }),
 
     // Category 4: VW85, VW90, VW95, HW30
-    CAT4_HIGH(4, "High", null, new byte[] { 0x00, 0x00 }),
-    CAT4_MIDDLE(4, "Middle", null, new byte[] { 0x00, 0x01 }),
-    CAT4_LOW1(4, "Low1", "Low 1", new byte[] { 0x00, 0x02 }),
-    CAT4_LOW2(4, "Low2", "Low 2", new byte[] { 0x00, 0x07 }),
-    CAT4_CUSTOM1(4, "Custom1", "Custom 1", new byte[] { 0x00, 0x03 }),
-    CAT4_CUSTOM2(4, "Custom2", "Custom 2", new byte[] { 0x00, 0x04 }),
-    CAT4_CUSTOM3(4, "Custom3", "Custom 3", new byte[] { 0x00, 0x05 }),
-    CAT4_CUSTOM4(4, "Custom4", "Custom 4", new byte[] { 0x00, 0x06 }),
-    CAT4_CUSTOM5(4, "Custom5", "Custom 5", new byte[] { 0x00, 0x08 }),
+    CAT4_HIGH(4, "High", new byte[] { 0x00, 0x00 }),
+    CAT4_MIDDLE(4, "Middle", new byte[] { 0x00, 0x01 }),
+    CAT4_LOW1(4, "Low1", new byte[] { 0x00, 0x02 }),
+    CAT4_LOW2(4, "Low2", new byte[] { 0x00, 0x07 }),
+    CAT4_CUSTOM1(4, "Custom1", new byte[] { 0x00, 0x03 }),
+    CAT4_CUSTOM2(4, "Custom2", new byte[] { 0x00, 0x04 }),
+    CAT4_CUSTOM3(4, "Custom3", new byte[] { 0x00, 0x05 }),
+    CAT4_CUSTOM4(4, "Custom4", new byte[] { 0x00, 0x06 }),
+    CAT4_CUSTOM5(4, "Custom5", new byte[] { 0x00, 0x08 }),
 
     // Category 5: VW1000ES, VW1100ES
-    CAT5_D93(5, "D93", null, new byte[] { 0x00, 0x00 }),
-    CAT5_D75(5, "D75", null, new byte[] { 0x00, 0x01 }),
-    CAT5_D65(5, "D65", null, new byte[] { 0x00, 0x02 }),
-    CAT5_D55(5, "D55", null, new byte[] { 0x00, 0x09 }),
-    CAT5_DCI(5, "DCI", null, new byte[] { 0x00, 0x07 }),
-    CAT5_CUSTOM1(5, "Custom1", "Custom 1", new byte[] { 0x00, 0x03 }),
-    CAT5_CUSTOM2(5, "Custom2", "Custom 2", new byte[] { 0x00, 0x04 }),
-    CAT5_CUSTOM3(5, "Custom3", "Custom 3", new byte[] { 0x00, 0x05 }),
-    CAT5_CUSTOM4(5, "Custom4", "Custom 4", new byte[] { 0x00, 0x06 }),
-    CAT5_CUSTOM5(5, "Custom5", "Custom 5", new byte[] { 0x00, 0x08 }),
+    CAT5_D93(5, "D93", new byte[] { 0x00, 0x00 }),
+    CAT5_D75(5, "D75", new byte[] { 0x00, 0x01 }),
+    CAT5_D65(5, "D65", new byte[] { 0x00, 0x02 }),
+    CAT5_D55(5, "D55", new byte[] { 0x00, 0x09 }),
+    CAT5_DCI(5, "DCI", new byte[] { 0x00, 0x07 }),
+    CAT5_CUSTOM1(5, "Custom1", new byte[] { 0x00, 0x03 }),
+    CAT5_CUSTOM2(5, "Custom2", new byte[] { 0x00, 0x04 }),
+    CAT5_CUSTOM3(5, "Custom3", new byte[] { 0x00, 0x05 }),
+    CAT5_CUSTOM4(5, "Custom4", new byte[] { 0x00, 0x06 }),
+    CAT5_CUSTOM5(5, "Custom5", new byte[] { 0x00, 0x08 }),
 
     // Category 6: HW35ES, HW40ES, HW45ES, HW58ES
-    CAT6_D93(6, "D93", null, new byte[] { 0x00, 0x00 }),
-    CAT6_D75(6, "D75", null, new byte[] { 0x00, 0x01 }),
-    CAT6_D65(6, "D65", null, new byte[] { 0x00, 0x02 }),
-    CAT6_D55(6, "D55", null, new byte[] { 0x00, 0x07 }),
-    CAT6_CUSTOM(6, "Custom", null, new byte[] { 0x00, 0x08 }),
+    CAT6_D93(6, "D93", new byte[] { 0x00, 0x00 }),
+    CAT6_D75(6, "D75", new byte[] { 0x00, 0x01 }),
+    CAT6_D65(6, "D65", new byte[] { 0x00, 0x02 }),
+    CAT6_D55(6, "D55", new byte[] { 0x00, 0x07 }),
+    CAT6_CUSTOM(6, "Custom", new byte[] { 0x00, 0x08 }),
 
     // Category 7: HW50ES, HW55ES
-    CAT7_D93(7, "D93", null, new byte[] { 0x00, 0x00 }),
-    CAT7_D75(7, "D75", null, new byte[] { 0x00, 0x01 }),
-    CAT7_D65(7, "D65", null, new byte[] { 0x00, 0x02 }),
-    CAT7_D55(7, "D55", null, new byte[] { 0x00, 0x07 }),
-    CAT7_CUSTOM1(7, "Custom1", "Custom 1", new byte[] { 0x00, 0x03 }),
-    CAT7_CUSTOM2(7, "Custom2", "Custom 2", new byte[] { 0x00, 0x04 }),
-    CAT7_CUSTOM3(7, "Custom3", "Custom 3", new byte[] { 0x00, 0x05 }),
-    CAT7_CUSTOM4(7, "Custom4", "Custom 4", new byte[] { 0x00, 0x06 }),
-    CAT7_CUSTOM5(7, "Custom5", "Custom 5", new byte[] { 0x00, 0x08 });
+    CAT7_D93(7, "D93", new byte[] { 0x00, 0x00 }),
+    CAT7_D75(7, "D75", new byte[] { 0x00, 0x01 }),
+    CAT7_D65(7, "D65", new byte[] { 0x00, 0x02 }),
+    CAT7_D55(7, "D55", new byte[] { 0x00, 0x07 }),
+    CAT7_CUSTOM1(7, "Custom1", new byte[] { 0x00, 0x03 }),
+    CAT7_CUSTOM2(7, "Custom2", new byte[] { 0x00, 0x04 }),
+    CAT7_CUSTOM3(7, "Custom3", new byte[] { 0x00, 0x05 }),
+    CAT7_CUSTOM4(7, "Custom4", new byte[] { 0x00, 0x06 }),
+    CAT7_CUSTOM5(7, "Custom5", new byte[] { 0x00, 0x08 });
 
     private int category;
     private String name;
-    private @Nullable String label;
     private byte[] dataCode;
 
     /**
@@ -110,13 +108,11 @@ public enum SonyProjectorColorTemp {
      *
      * @param category a category of projector models for which the color temperature is available
      * @param name the name of the color temperature
-     * @param label the label of the color temperature; can be null when the label is identical to the name
      * @param dataCode the data code identifying the color temperature
      */
-    private SonyProjectorColorTemp(int category, String name, @Nullable String label, byte[] dataCode) {
+    private SonyProjectorColorTemp(int category, String name, byte[] dataCode) {
         this.category = category;
         this.name = name;
-        this.label = label;
         this.dataCode = dataCode;
     }
 
@@ -138,15 +134,6 @@ public enum SonyProjectorColorTemp {
         return dataCode;
     }
 
-    /**
-     * Get the label of the current color temperature
-     *
-     * @return the label
-     */
-    public @Nullable String getLabel() {
-        return label;
-    }
-
     /**
      * Get the name of the current color temperature
      *
@@ -169,8 +156,7 @@ public enum SonyProjectorColorTemp {
         List<StateOption> options = new ArrayList<>();
         for (SonyProjectorColorTemp value : SonyProjectorColorTemp.values()) {
             if (value.getCategory() == category) {
-                options.add(new StateOption(value.getName(),
-                        value.getLabel() != null ? value.getLabel() : value.getName()));
+                options.add(new StateOption(value.getName(), value.getName()));
             }
         }
         return options;
diff --git a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorConnector.java b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorConnector.java
index c037924dd90..c319217ade2 100644
--- a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorConnector.java
+++ b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorConnector.java
@@ -103,7 +103,7 @@ public abstract class SonyProjectorConnector {
             status = getStatusPower();
         } catch (SonyProjectorException e) {
         }
-        logger.debug("Current Power Status: {}", status == null ? "undefined" : status.getName());
+        logger.debug("Current Power Status: {}", status == null ? "undefined" : status.toString());
         if (status != null && status != SonyProjectorStatusPower.STANDBY) {
             throw new SonyProjectorException("Projector not ready for command ON");
         } else if (model.isPowerCmdAvailable()) {
@@ -129,7 +129,7 @@ public abstract class SonyProjectorConnector {
             status = getStatusPower();
         } catch (SonyProjectorException e) {
         }
-        logger.debug("Current Power Status: {}", status == null ? "undefined" : status.getName());
+        logger.debug("Current Power Status: {}", status == null ? "undefined" : status.toString());
         if (status == null || status != SonyProjectorStatusPower.POWER_ON) {
             throw new SonyProjectorException("Projector not ready for command OFF");
         } else if (model.isPowerCmdAvailable()) {
diff --git a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorContrastEnhancer.java b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorContrastEnhancer.java
index 4e51ce2fdbc..e05385489e4 100644
--- a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorContrastEnhancer.java
+++ b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorContrastEnhancer.java
@@ -17,7 +17,6 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.sonyprojector.internal.SonyProjectorException;
 import org.openhab.core.types.StateOption;
 import org.openhab.core.util.HexUtils;
@@ -33,28 +32,27 @@ public enum SonyProjectorContrastEnhancer {
     // Category 1: VW260, VW270, VW285, VW295, VW300, VW315, VW320, VW328, VW350, VW365, VW385, VW500, VW515, VW520,
     // VW528, VW550, VW570, VW600, VW665, VW675, VW695, VW760, VW870, VW885, VW995, VW1000ES, VW1100ES, HW40ES, HW45ES,
     // HW50ES, HW55ES, HW58ES, HW60, HW65, HW68
-    CAT1_HIGH(1, "High", null, new byte[] { 0x00, 0x02 }),
-    CAT1_MIDDLE(1, "Middle", null, new byte[] { 0x00, 0x03 }),
-    CAT1_LOW(1, "Low", null, new byte[] { 0x00, 0x01 }),
-    CAT1_OFF(1, "Off", null, new byte[] { 0x00, 0x00 }),
+    CAT1_HIGH(1, "High", new byte[] { 0x00, 0x02 }),
+    CAT1_MIDDLE(1, "Middle", new byte[] { 0x00, 0x03 }),
+    CAT1_LOW(1, "Low", new byte[] { 0x00, 0x01 }),
+    CAT1_OFF(1, "Off", new byte[] { 0x00, 0x00 }),
 
     // Category 2: VW40, VW50, VW60, VW70, VW80, VW100, VW200, HW10, HW15, HW20
-    CAT2_HIGH(2, "High", null, new byte[] { 0x00, 0x02 }),
-    CAT2_LOW(2, "Low", null, new byte[] { 0x00, 0x01 }),
-    CAT2_OFF(2, "Off", null, new byte[] { 0x00, 0x00 }),
+    CAT2_HIGH(2, "High", new byte[] { 0x00, 0x02 }),
+    CAT2_LOW(2, "Low", new byte[] { 0x00, 0x01 }),
+    CAT2_OFF(2, "Off", new byte[] { 0x00, 0x00 }),
 
     // Category 3: VW85, VW90, VW95, HW30ES
-    CAT3_LEVEL_MINUS_3(3, "-3", null, new byte[] { (byte) 0xFF, (byte) 0xFD }),
-    CAT3_LEVEL_MINUS_2(3, "-2", null, new byte[] { (byte) 0xFF, (byte) 0xFE }),
-    CAT3_LEVEL_MINUS_1(3, "-1", null, new byte[] { (byte) 0xFF, (byte) 0xFF }),
-    CAT3_LEVEL_0(3, "0", null, new byte[] { 0x00, 0x00 }),
-    CAT3_LEVEL_PLUS_1(3, "1", null, new byte[] { 0x00, 0x01 }),
-    CAT3_LEVEL_PLUS_2(3, "2", null, new byte[] { 0x00, 0x02 }),
-    CAT3_LEVEL_PLUS_3(3, "3", null, new byte[] { 0x00, 0x03 });
+    CAT3_LEVEL_MINUS_3(3, "-3", new byte[] { (byte) 0xFF, (byte) 0xFD }),
+    CAT3_LEVEL_MINUS_2(3, "-2", new byte[] { (byte) 0xFF, (byte) 0xFE }),
+    CAT3_LEVEL_MINUS_1(3, "-1", new byte[] { (byte) 0xFF, (byte) 0xFF }),
+    CAT3_LEVEL_0(3, "0", new byte[] { 0x00, 0x00 }),
+    CAT3_LEVEL_PLUS_1(3, "1", new byte[] { 0x00, 0x01 }),
+    CAT3_LEVEL_PLUS_2(3, "2", new byte[] { 0x00, 0x02 }),
+    CAT3_LEVEL_PLUS_3(3, "3", new byte[] { 0x00, 0x03 });
 
     private int category;
     private String name;
-    private @Nullable String label;
     private byte[] dataCode;
 
     /**
@@ -62,13 +60,11 @@ public enum SonyProjectorContrastEnhancer {
      *
      * @param category a category of projector models for which the contrast enhancer mode is available
      * @param name the name of the contrast enhancer mode
-     * @param label the label of the contrast enhancer mode; can be null when the label is identical to the name
      * @param dataCode the data code identifying the contrast enhancer mode
      */
-    private SonyProjectorContrastEnhancer(int category, String name, @Nullable String label, byte[] dataCode) {
+    private SonyProjectorContrastEnhancer(int category, String name, byte[] dataCode) {
         this.category = category;
         this.name = name;
-        this.label = label;
         this.dataCode = dataCode;
     }
 
@@ -90,15 +86,6 @@ public enum SonyProjectorContrastEnhancer {
         return dataCode;
     }
 
-    /**
-     * Get the label of the current contrast enhancer mode
-     *
-     * @return the label
-     */
-    public @Nullable String getLabel() {
-        return label;
-    }
-
     /**
      * Get the name of the current contrast enhancer mode
      *
@@ -121,8 +108,7 @@ public enum SonyProjectorContrastEnhancer {
         List<StateOption> options = new ArrayList<>();
         for (SonyProjectorContrastEnhancer value : SonyProjectorContrastEnhancer.values()) {
             if (value.getCategory() == category) {
-                options.add(new StateOption(value.getName(),
-                        value.getLabel() != null ? value.getLabel() : value.getName()));
+                options.add(new StateOption(value.getName(), value.getName()));
             }
         }
         return options;
diff --git a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorFilmMode.java b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorFilmMode.java
index 19b53bc7185..26686f33c06 100644
--- a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorFilmMode.java
+++ b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorFilmMode.java
@@ -17,7 +17,6 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.sonyprojector.internal.SonyProjectorException;
 import org.openhab.core.types.StateOption;
 import org.openhab.core.util.HexUtils;
@@ -33,21 +32,20 @@ public enum SonyProjectorFilmMode {
     // Category 1: VW70, VW260, VW270, VW285, VW295, VW300, VW315, VW320, VW328, VW350, VW365, VW385, VW500, VW515,
     // VW520, VW528, VW550, VW570, VW600, VW665, VW675, VW695, VW760, VW870, VW885, VW995, HW10, HW15, HW20, HW45ES,
     // HW60, HW65, HW68
-    CAT1_AUTO(1, "Auto", null, new byte[] { 0x00, 0x02 }),
-    CAT1_OFF(1, "Off", null, new byte[] { 0x00, 0x00 }),
+    CAT1_AUTO(1, "Auto", new byte[] { 0x00, 0x02 }),
+    CAT1_OFF(1, "Off", new byte[] { 0x00, 0x00 }),
 
     // Category 2: VW80, VW85, VW90, VW95, VW200, VW1000ES, VW1100ES, HW30ES, HW40ES, HW50ES, HW55ES, HW58ES
-    CAT2_AUTO1(2, "Auto1", "Auto 1", new byte[] { 0x00, 0x01 }),
-    CAT2_AUTO2(2, "Auto2", "Auto 2", new byte[] { 0x00, 0x02 }),
-    CAT2_OFF(2, "Off", null, new byte[] { 0x00, 0x00 }),
+    CAT2_AUTO1(2, "Auto1", new byte[] { 0x00, 0x01 }),
+    CAT2_AUTO2(2, "Auto2", new byte[] { 0x00, 0x02 }),
+    CAT2_OFF(2, "Off", new byte[] { 0x00, 0x00 }),
 
     // Category 3: VW100
-    CAT3_AUTO(3, "Auto", null, new byte[] { 0x00, 0x00 }),
-    CAT3_OFF(3, "Off", null, new byte[] { 0x00, 0x01 });
+    CAT3_AUTO(3, "Auto", new byte[] { 0x00, 0x00 }),
+    CAT3_OFF(3, "Off", new byte[] { 0x00, 0x01 });
 
     private int category;
     private String name;
-    private @Nullable String label;
     private byte[] dataCode;
 
     /**
@@ -55,13 +53,11 @@ public enum SonyProjectorFilmMode {
      *
      * @param category a category of projector models for which the film mode is available
      * @param name the name of the film mode
-     * @param label the label of the film mode; can be null when the label is identical to the name
      * @param dataCode the data code identifying the film mode
      */
-    private SonyProjectorFilmMode(int category, String name, @Nullable String label, byte[] dataCode) {
+    private SonyProjectorFilmMode(int category, String name, byte[] dataCode) {
         this.category = category;
         this.name = name;
-        this.label = label;
         this.dataCode = dataCode;
     }
 
@@ -83,15 +79,6 @@ public enum SonyProjectorFilmMode {
         return dataCode;
     }
 
-    /**
-     * Get the label of the current film mode
-     *
-     * @return the label
-     */
-    public @Nullable String getLabel() {
-        return label;
-    }
-
     /**
      * Get the name of the current film mode
      *
@@ -114,8 +101,7 @@ public enum SonyProjectorFilmMode {
         List<StateOption> options = new ArrayList<>();
         for (SonyProjectorFilmMode value : SonyProjectorFilmMode.values()) {
             if (value.getCategory() == category) {
-                options.add(new StateOption(value.getName(),
-                        value.getLabel() != null ? value.getLabel() : value.getName()));
+                options.add(new StateOption(value.getName(), value.getName()));
             }
         }
         return options;
diff --git a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorFilmProjection.java b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorFilmProjection.java
index a2120b94ea2..3e68a4147eb 100644
--- a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorFilmProjection.java
+++ b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorFilmProjection.java
@@ -17,7 +17,6 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.sonyprojector.internal.SonyProjectorException;
 import org.openhab.core.types.StateOption;
 import org.openhab.core.util.HexUtils;
@@ -31,23 +30,22 @@ import org.openhab.core.util.HexUtils;
 public enum SonyProjectorFilmProjection {
 
     // Category 1: VW80, VW85, VW200
-    CAT1_MODE1(1, "Mode1", "Mode 1", new byte[] { 0x00, 0x01 }),
-    CAT1_MODE2(1, "Mode2", "Mode 2", new byte[] { 0x00, 0x02 }),
-    CAT1_MODE3(1, "Mode3", "Mode 3", new byte[] { 0x00, 0x03 }),
-    CAT1_OFF(1, "Off", null, new byte[] { 0x00, 0x00 }),
+    CAT1_MODE1(1, "Mode1", new byte[] { 0x00, 0x01 }),
+    CAT1_MODE2(1, "Mode2", new byte[] { 0x00, 0x02 }),
+    CAT1_MODE3(1, "Mode3", new byte[] { 0x00, 0x03 }),
+    CAT1_OFF(1, "Off", new byte[] { 0x00, 0x00 }),
 
     // Category 2: VW90, VW95
-    CAT2_MODE1(2, "Mode1", "Mode 1", new byte[] { 0x00, 0x01 }),
-    CAT2_MODE2(2, "Mode2", "Mode 2", new byte[] { 0x00, 0x02 }),
-    CAT2_OFF(2, "Off", null, new byte[] { 0x00, 0x00 }),
+    CAT2_MODE1(2, "Mode1", new byte[] { 0x00, 0x01 }),
+    CAT2_MODE2(2, "Mode2", new byte[] { 0x00, 0x02 }),
+    CAT2_OFF(2, "Off", new byte[] { 0x00, 0x00 }),
 
     // Category 3: VW1000ES, VW1100ES, HW35ES, HW40ES, HW50ES, HW55ES, HW58ES
-    CAT3_ON(3, "On", null, new byte[] { 0x00, 0x01 }),
-    CAT3_OFF(3, "Off", null, new byte[] { 0x00, 0x00 });
+    CAT3_ON(3, "On", new byte[] { 0x00, 0x01 }),
+    CAT3_OFF(3, "Off", new byte[] { 0x00, 0x00 });
 
     private int category;
     private String name;
-    private @Nullable String label;
     private byte[] dataCode;
 
     /**
@@ -55,13 +53,11 @@ public enum SonyProjectorFilmProjection {
      *
      * @param category a category of projector models for which the film projection mode is available
      * @param name the name of the film projection mode
-     * @param label the label of the film projection mode; can be null when the label is identical to the name
      * @param dataCode the data code identifying the film projection mode
      */
-    private SonyProjectorFilmProjection(int category, String name, @Nullable String label, byte[] dataCode) {
+    private SonyProjectorFilmProjection(int category, String name, byte[] dataCode) {
         this.category = category;
         this.name = name;
-        this.label = label;
         this.dataCode = dataCode;
     }
 
@@ -83,15 +79,6 @@ public enum SonyProjectorFilmProjection {
         return dataCode;
     }
 
-    /**
-     * Get the label of the current film projection mode
-     *
-     * @return the label
-     */
-    public @Nullable String getLabel() {
-        return label;
-    }
-
     /**
      * Get the name of the current film projection mode
      *
@@ -114,8 +101,7 @@ public enum SonyProjectorFilmProjection {
         List<StateOption> options = new ArrayList<>();
         for (SonyProjectorFilmProjection value : SonyProjectorFilmProjection.values()) {
             if (value.getCategory() == category) {
-                options.add(new StateOption(value.getName(),
-                        value.getLabel() != null ? value.getLabel() : value.getName()));
+                options.add(new StateOption(value.getName(), value.getName()));
             }
         }
         return options;
diff --git a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorGammaCorrection.java b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorGammaCorrection.java
index f32a4ebcaaf..c562da039dd 100644
--- a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorGammaCorrection.java
+++ b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorGammaCorrection.java
@@ -17,7 +17,6 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.sonyprojector.internal.SonyProjectorException;
 import org.openhab.core.types.StateOption;
 import org.openhab.core.util.HexUtils;
@@ -33,69 +32,68 @@ public enum SonyProjectorGammaCorrection {
     // Category 1: VW260, VW270, VW285, VW295, VW300, VW315, VW320, VW328, VW350, VW365, VW385, VW500, VW515, VW520,
     // VW528, VW550, VW570, VW600, VW665, VW675, VW695, VW760, VW870, VW885, VW995, VW1000ES, VW1100ES, HW50ES, HW55ES,
     // HW60, HW65, HW68
-    CAT1_18(1, "1.8", null, new byte[] { 0x00, 0x01 }),
-    CAT1_20(1, "2.0", null, new byte[] { 0x00, 0x02 }),
-    CAT1_21(1, "2.1", null, new byte[] { 0x00, 0x03 }),
-    CAT1_22(1, "2.2", null, new byte[] { 0x00, 0x04 }),
-    CAT1_24(1, "2.4", null, new byte[] { 0x00, 0x05 }),
-    CAT1_26(1, "2.6", null, new byte[] { 0x00, 0x06 }),
-    CAT1_GAMMA7(1, "Gamma7", "Gamma 7", new byte[] { 0x00, 0x07 }),
-    CAT1_GAMMA8(1, "Gamma8", "Gamma 8", new byte[] { 0x00, 0x08 }),
-    CAT1_GAMMA9(1, "Gamma9", "Gamma 9", new byte[] { 0x00, 0x09 }),
-    CAT1_GAMMA10(1, "Gamma10", "Gamma 10", new byte[] { 0x00, 0x0A }),
-    CAT1_OFF(1, "Off", null, new byte[] { 0x00, 0x00 }),
+    CAT1_18(1, "1.8", new byte[] { 0x00, 0x01 }),
+    CAT1_20(1, "2.0", new byte[] { 0x00, 0x02 }),
+    CAT1_21(1, "2.1", new byte[] { 0x00, 0x03 }),
+    CAT1_22(1, "2.2", new byte[] { 0x00, 0x04 }),
+    CAT1_24(1, "2.4", new byte[] { 0x00, 0x05 }),
+    CAT1_26(1, "2.6", new byte[] { 0x00, 0x06 }),
+    CAT1_GAMMA7(1, "Gamma7", new byte[] { 0x00, 0x07 }),
+    CAT1_GAMMA8(1, "Gamma8", new byte[] { 0x00, 0x08 }),
+    CAT1_GAMMA9(1, "Gamma9", new byte[] { 0x00, 0x09 }),
+    CAT1_GAMMA10(1, "Gamma10", new byte[] { 0x00, 0x0A }),
+    CAT1_OFF(1, "Off", new byte[] { 0x00, 0x00 }),
 
     // Category 2: VW40, VW50, VW60, VW100, VW200, HW10
-    CAT2_GAMMA1(2, "Gamma1", "Gamma 1", new byte[] { 0x00, 0x01 }),
-    CAT2_GAMMA2(2, "Gamma2", "Gamma 2", new byte[] { 0x00, 0x02 }),
-    CAT2_GAMMA3(2, "Gamma3", "Gamma 3", new byte[] { 0x00, 0x03 }),
-    CAT2_OFF(2, "Off", null, new byte[] { 0x00, 0x00 }),
+    CAT2_GAMMA1(2, "Gamma1", new byte[] { 0x00, 0x01 }),
+    CAT2_GAMMA2(2, "Gamma2", new byte[] { 0x00, 0x02 }),
+    CAT2_GAMMA3(2, "Gamma3", new byte[] { 0x00, 0x03 }),
+    CAT2_OFF(2, "Off", new byte[] { 0x00, 0x00 }),
 
     // Category 3: VW70, VW80, HW15, HW20
-    CAT3_GAMMA1(3, "Gamma1", "Gamma 1", new byte[] { 0x00, 0x01 }),
-    CAT3_GAMMA2(3, "Gamma2", "Gamma 2", new byte[] { 0x00, 0x02 }),
-    CAT3_GAMMA3(3, "Gamma3", "Gamma 3", new byte[] { 0x00, 0x03 }),
-    CAT3_GAMMA4(3, "Gamma4", "Gamma 4", new byte[] { 0x00, 0x04 }),
-    CAT3_GAMMA5(3, "Gamma5", "Gamma 5", new byte[] { 0x00, 0x05 }),
-    CAT3_GAMMA6(3, "Gamma6", "Gamma 6", new byte[] { 0x00, 0x06 }),
-    CAT3_OFF(3, "Off", null, new byte[] { 0x00, 0x00 }),
+    CAT3_GAMMA1(3, "Gamma1", new byte[] { 0x00, 0x01 }),
+    CAT3_GAMMA2(3, "Gamma2", new byte[] { 0x00, 0x02 }),
+    CAT3_GAMMA3(3, "Gamma3", new byte[] { 0x00, 0x03 }),
+    CAT3_GAMMA4(3, "Gamma4", new byte[] { 0x00, 0x04 }),
+    CAT3_GAMMA5(3, "Gamma5", new byte[] { 0x00, 0x05 }),
+    CAT3_GAMMA6(3, "Gamma6", new byte[] { 0x00, 0x06 }),
+    CAT3_OFF(3, "Off", new byte[] { 0x00, 0x00 }),
 
     // Category 4: HW30ES
-    CAT4_GAMMA1(4, "Gamma1", "Gamma 1", new byte[] { 0x00, 0x01 }),
-    CAT4_GAMMA2(4, "Gamma2", "Gamma 2", new byte[] { 0x00, 0x02 }),
-    CAT4_GAMMA3(4, "Gamma3", "Gamma 3", new byte[] { 0x00, 0x03 }),
-    CAT4_GAMMA4(4, "Gamma4", "Gamma 4", new byte[] { 0x00, 0x04 }),
-    CAT4_GAMMA5(4, "Gamma5", "Gamma 5", new byte[] { 0x00, 0x05 }),
-    CAT4_GAMMA6(4, "Gamma6", "Gamma 6", new byte[] { 0x00, 0x06 }),
-    CAT4_GAMMA7(4, "Gamma7", "Gamma 7", new byte[] { 0x00, 0x07 }),
-    CAT4_GAMMA8(4, "Gamma8", "Gamma 8", new byte[] { 0x00, 0x08 }),
-    CAT4_OFF(4, "Off", null, new byte[] { 0x00, 0x00 }),
+    CAT4_GAMMA1(4, "Gamma1", new byte[] { 0x00, 0x01 }),
+    CAT4_GAMMA2(4, "Gamma2", new byte[] { 0x00, 0x02 }),
+    CAT4_GAMMA3(4, "Gamma3", new byte[] { 0x00, 0x03 }),
+    CAT4_GAMMA4(4, "Gamma4", new byte[] { 0x00, 0x04 }),
+    CAT4_GAMMA5(4, "Gamma5", new byte[] { 0x00, 0x05 }),
+    CAT4_GAMMA6(4, "Gamma6", new byte[] { 0x00, 0x06 }),
+    CAT4_GAMMA7(4, "Gamma7", new byte[] { 0x00, 0x07 }),
+    CAT4_GAMMA8(4, "Gamma8", new byte[] { 0x00, 0x08 }),
+    CAT4_OFF(4, "Off", new byte[] { 0x00, 0x00 }),
 
     // Category 5: VW85, VW90, VW95
-    CAT5_GAMMA1(5, "Gamma1", "Gamma 1", new byte[] { 0x00, 0x01 }),
-    CAT5_GAMMA2(5, "Gamma2", "Gamma 2", new byte[] { 0x00, 0x02 }),
-    CAT5_GAMMA3(5, "Gamma3", "Gamma 3", new byte[] { 0x00, 0x03 }),
-    CAT5_GAMMA4(5, "Gamma4", "Gamma 4", new byte[] { 0x00, 0x04 }),
-    CAT5_GAMMA5(5, "Gamma5", "Gamma 5", new byte[] { 0x00, 0x05 }),
-    CAT5_GAMMA6(5, "Gamma6", "Gamma 6", new byte[] { 0x00, 0x06 }),
-    CAT5_GAMMA7(5, "Gamma7", "Gamma 7", new byte[] { 0x00, 0x07 }),
-    CAT5_GAMMA8(5, "Gamma8", "Gamma 8", new byte[] { 0x00, 0x08 }),
-    CAT5_GAMMA9(5, "Gamma9", "Gamma 9", new byte[] { 0x00, 0x09 }),
-    CAT5_GAMMA10(5, "Gamma10", "Gamma 10", new byte[] { 0x00, 0x0A }),
-    CAT5_OFF(5, "Off", null, new byte[] { 0x00, 0x00 }),
+    CAT5_GAMMA1(5, "Gamma1", new byte[] { 0x00, 0x01 }),
+    CAT5_GAMMA2(5, "Gamma2", new byte[] { 0x00, 0x02 }),
+    CAT5_GAMMA3(5, "Gamma3", new byte[] { 0x00, 0x03 }),
+    CAT5_GAMMA4(5, "Gamma4", new byte[] { 0x00, 0x04 }),
+    CAT5_GAMMA5(5, "Gamma5", new byte[] { 0x00, 0x05 }),
+    CAT5_GAMMA6(5, "Gamma6", new byte[] { 0x00, 0x06 }),
+    CAT5_GAMMA7(5, "Gamma7", new byte[] { 0x00, 0x07 }),
+    CAT5_GAMMA8(5, "Gamma8", new byte[] { 0x00, 0x08 }),
+    CAT5_GAMMA9(5, "Gamma9", new byte[] { 0x00, 0x09 }),
+    CAT5_GAMMA10(5, "Gamma10", new byte[] { 0x00, 0x0A }),
+    CAT5_OFF(5, "Off", new byte[] { 0x00, 0x00 }),
 
     // Category 6: HW35ES, HW40ES, HW45ES, HW58ES
-    CAT6_20(6, "2.0", null, new byte[] { 0x00, 0x02 }),
-    CAT6_22(6, "2.2", null, new byte[] { 0x00, 0x04 }),
-    CAT6_24(6, "2.4", null, new byte[] { 0x00, 0x05 }),
-    CAT6_GAMMA4(6, "Gamma4", "Gamma 4", new byte[] { 0x00, 0x08 }),
-    CAT6_GAMMA5(6, "Gamma5", "Gamma 5", new byte[] { 0x00, 0x09 }),
-    CAT6_GAMMA6(6, "Gamma6", "Gamma 6", new byte[] { 0x00, 0x0A }),
-    CAT6_OFF(6, "Off", null, new byte[] { 0x00, 0x00 });
+    CAT6_20(6, "2.0", new byte[] { 0x00, 0x02 }),
+    CAT6_22(6, "2.2", new byte[] { 0x00, 0x04 }),
+    CAT6_24(6, "2.4", new byte[] { 0x00, 0x05 }),
+    CAT6_GAMMA4(6, "Gamma4", new byte[] { 0x00, 0x08 }),
+    CAT6_GAMMA5(6, "Gamma5", new byte[] { 0x00, 0x09 }),
+    CAT6_GAMMA6(6, "Gamma6", new byte[] { 0x00, 0x0A }),
+    CAT6_OFF(6, "Off", new byte[] { 0x00, 0x00 });
 
     private int category;
     private String name;
-    private @Nullable String label;
     private byte[] dataCode;
 
     /**
@@ -103,13 +101,11 @@ public enum SonyProjectorGammaCorrection {
      *
      * @param category a category of projector models for which the gamma correction is available
      * @param name the name of the gamma correction
-     * @param label the label of the gamma correction; can be null when the label is identical to the name
      * @param dataCode the data code identifying the gamma correction
      */
-    private SonyProjectorGammaCorrection(int category, String name, @Nullable String label, byte[] dataCode) {
+    private SonyProjectorGammaCorrection(int category, String name, byte[] dataCode) {
         this.category = category;
         this.name = name;
-        this.label = label;
         this.dataCode = dataCode;
     }
 
@@ -131,15 +127,6 @@ public enum SonyProjectorGammaCorrection {
         return dataCode;
     }
 
-    /**
-     * Get the label of the current gamma correction
-     *
-     * @return the label
-     */
-    public @Nullable String getLabel() {
-        return label;
-    }
-
     /**
      * Get the name of the current gamma correction
      *
@@ -162,8 +149,7 @@ public enum SonyProjectorGammaCorrection {
         List<StateOption> options = new ArrayList<>();
         for (SonyProjectorGammaCorrection value : SonyProjectorGammaCorrection.values()) {
             if (value.getCategory() == category) {
-                options.add(new StateOption(value.getName(),
-                        value.getLabel() != null ? value.getLabel() : value.getName()));
+                options.add(new StateOption(value.getName(), value.getName()));
             }
         }
         return options;
diff --git a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorInput.java b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorInput.java
index 69b60f31356..a7fa4b1ede3 100644
--- a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorInput.java
+++ b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorInput.java
@@ -17,7 +17,6 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.sonyprojector.internal.SonyProjectorException;
 import org.openhab.core.types.StateOption;
 import org.openhab.core.util.HexUtils;
@@ -32,41 +31,40 @@ public enum SonyProjectorInput {
 
     // Category 1: VW260, VW270, VW285, VW295, VW300, VW315, VW320, VW328, VW350, VW365, VW385, VW500, VW515, VW520,
     // VW528, VW550, VW570, VW600, VW665, VW675, VW695, VW760, VW870, VW885, VW995, HW45ES, HW60, HW65, HW68
-    CAT1_HDMI1(1, "HDMI1", "HDMI 1", new byte[] { 0x00, 0x02 }),
-    CAT1_HDMI2(1, "HDMI2", "HDMI 2", new byte[] { 0x00, 0x03 }),
+    CAT1_HDMI1(1, "HDMI1", new byte[] { 0x00, 0x02 }),
+    CAT1_HDMI2(1, "HDMI2", new byte[] { 0x00, 0x03 }),
 
     // Category 2: VW40, VW50, VW60, VW70, VW80, VW85, VW200, HW10, HW15, HW20
-    CAT2_VIDEO(2, "Video", null, new byte[] { 0x00, 0x00 }),
-    CAT2_SVIDEO(2, "SVideo", "S-Video", new byte[] { 0x00, 0x01 }),
-    CAT2_INPUT_A(2, "InputA", "Input A", new byte[] { 0x00, 0x02 }),
-    CAT2_COMPONENT(2, "Component", null, new byte[] { 0x00, 0x03 }),
-    CAT2_HDMI1(2, "HDMI1", "HDMI 1", new byte[] { 0x00, 0x04 }),
-    CAT2_HDMI2(2, "HDMI2", "HDMI 2", new byte[] { 0x00, 0x05 }),
+    CAT2_VIDEO(2, "Video", new byte[] { 0x00, 0x00 }),
+    CAT2_SVIDEO(2, "SVideo", new byte[] { 0x00, 0x01 }),
+    CAT2_INPUT_A(2, "InputA", new byte[] { 0x00, 0x02 }),
+    CAT2_COMPONENT(2, "Component", new byte[] { 0x00, 0x03 }),
+    CAT2_HDMI1(2, "HDMI1", new byte[] { 0x00, 0x04 }),
+    CAT2_HDMI2(2, "HDMI2", new byte[] { 0x00, 0x05 }),
 
     // Category 3: VW95, VW1000ES, VW1100ES, HW30ES, HW40ES, HW50ES, HW55ES, HW58ES
-    CAT3_INPUT_A(3, "InputA", "Input A", new byte[] { 0x00, 0x02 }),
-    CAT3_COMPONENT(3, "Component", null, new byte[] { 0x00, 0x03 }),
-    CAT3_HDMI1(3, "HDMI1", "HDMI 1", new byte[] { 0x00, 0x04 }),
-    CAT3_HDMI2(3, "HDMI2", "HDMI 2", new byte[] { 0x00, 0x05 }),
+    CAT3_INPUT_A(3, "InputA", new byte[] { 0x00, 0x02 }),
+    CAT3_COMPONENT(3, "Component", new byte[] { 0x00, 0x03 }),
+    CAT3_HDMI1(3, "HDMI1", new byte[] { 0x00, 0x04 }),
+    CAT3_HDMI2(3, "HDMI2", new byte[] { 0x00, 0x05 }),
 
     // Category 4: VW100
-    CAT4_VIDEO(4, "Video", null, new byte[] { 0x00, 0x00 }),
-    CAT4_SVIDEO(4, "SVideo", "S-Video", new byte[] { 0x00, 0x01 }),
-    CAT4_INPUT_A(4, "InputA", "Input A", new byte[] { 0x00, 0x02 }),
-    CAT4_COMPONENT(4, "Component", null, new byte[] { 0x00, 0x03 }),
-    CAT4_HDMI(4, "HDMI", null, new byte[] { 0x00, 0x04 }),
-    CAT4_DVI(4, "DVI", null, new byte[] { 0x00, 0x05 }),
+    CAT4_VIDEO(4, "Video", new byte[] { 0x00, 0x00 }),
+    CAT4_SVIDEO(4, "SVideo", new byte[] { 0x00, 0x01 }),
+    CAT4_INPUT_A(4, "InputA", new byte[] { 0x00, 0x02 }),
+    CAT4_COMPONENT(4, "Component", new byte[] { 0x00, 0x03 }),
+    CAT4_HDMI(4, "HDMI", new byte[] { 0x00, 0x04 }),
+    CAT4_DVI(4, "DVI", new byte[] { 0x00, 0x05 }),
 
     // Category 5: VW90
-    CAT5_VIDEO(5, "Video", null, new byte[] { 0x00, 0x00 }),
-    CAT5_INPUT_A(5, "InputA", "Input A", new byte[] { 0x00, 0x02 }),
-    CAT5_COMPONENT(5, "Component", null, new byte[] { 0x00, 0x03 }),
-    CAT5_HDMI1(5, "HDMI1", "HDMI 1", new byte[] { 0x00, 0x04 }),
-    CAT5_HDMI2(5, "HDMI2", "HDMI 2", new byte[] { 0x00, 0x05 });
+    CAT5_VIDEO(5, "Video", new byte[] { 0x00, 0x00 }),
+    CAT5_INPUT_A(5, "InputA", new byte[] { 0x00, 0x02 }),
+    CAT5_COMPONENT(5, "Component", new byte[] { 0x00, 0x03 }),
+    CAT5_HDMI1(5, "HDMI1", new byte[] { 0x00, 0x04 }),
+    CAT5_HDMI2(5, "HDMI2", new byte[] { 0x00, 0x05 });
 
     private int category;
     private String name;
-    private @Nullable String label;
     private byte[] dataCode;
 
     /**
@@ -74,13 +72,11 @@ public enum SonyProjectorInput {
      *
      * @param category a category of projector models for which the video input is available
      * @param name the name of the video input
-     * @param label the label of the video input; can be null when the label is identical to the name
      * @param dataCode the data code identifying the video input
      */
-    private SonyProjectorInput(int category, String name, @Nullable String label, byte[] dataCode) {
+    private SonyProjectorInput(int category, String name, byte[] dataCode) {
         this.category = category;
         this.name = name;
-        this.label = label;
         this.dataCode = dataCode;
     }
 
@@ -102,15 +98,6 @@ public enum SonyProjectorInput {
         return dataCode;
     }
 
-    /**
-     * Get the label of the current video input
-     *
-     * @return the label
-     */
-    public @Nullable String getLabel() {
-        return label;
-    }
-
     /**
      * Get the name of the current video input
      *
@@ -133,8 +120,7 @@ public enum SonyProjectorInput {
         List<StateOption> options = new ArrayList<>();
         for (SonyProjectorInput value : SonyProjectorInput.values()) {
             if (value.getCategory() == category) {
-                options.add(new StateOption(value.getName(),
-                        value.getLabel() != null ? value.getLabel() : value.getName()));
+                options.add(new StateOption(value.getName(), value.getName()));
             }
         }
         return options;
diff --git a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorIrisMode.java b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorIrisMode.java
index bc392432cb7..481c9932b3e 100644
--- a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorIrisMode.java
+++ b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorIrisMode.java
@@ -17,7 +17,6 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.sonyprojector.internal.SonyProjectorException;
 import org.openhab.core.types.StateOption;
 import org.openhab.core.util.HexUtils;
@@ -32,36 +31,35 @@ public enum SonyProjectorIrisMode {
 
     // Category 1: VW385, VW500, VW515, VW520, VW528, VW550, VW570, VW600, VW665, VW675, VW695, VW760, VW870, VW885,
     // VW995, HW60, HW65, HW68
-    CAT1_FULL(1, "Full", null, new byte[] { 0x00, 0x02 }),
-    CAT1_LIMITED(1, "Limited", null, new byte[] { 0x00, 0x03 }),
-    CAT1_OFF(1, "Off", null, new byte[] { 0x00, 0x00 }),
+    CAT1_FULL(1, "Full", new byte[] { 0x00, 0x02 }),
+    CAT1_LIMITED(1, "Limited", new byte[] { 0x00, 0x03 }),
+    CAT1_OFF(1, "Off", new byte[] { 0x00, 0x00 }),
 
     // Category 2: VW40, VW50, VW60
-    CAT2_ON(2, "On", null, new byte[] { 0x00, 0x01 }),
-    CAT2_AUTO1(2, "Auto1", "Auto 1", new byte[] { 0x00, 0x02 }),
-    CAT2_AUTO2(2, "Auto2", "Auto 2", new byte[] { 0x00, 0x03 }),
-    CAT2_OFF(2, "Off", null, new byte[] { 0x00, 0x00 }),
+    CAT2_ON(2, "On", new byte[] { 0x00, 0x01 }),
+    CAT2_AUTO1(2, "Auto1", new byte[] { 0x00, 0x02 }),
+    CAT2_AUTO2(2, "Auto2", new byte[] { 0x00, 0x03 }),
+    CAT2_OFF(2, "Off", new byte[] { 0x00, 0x00 }),
 
     // Category 3: VW70, VW80, VW85, VW90, VW95, VW200, HW10, HW15, HW20, HW30ES
-    CAT3_AUTO1(3, "Auto1", "Auto 1", new byte[] { 0x00, 0x02 }),
-    CAT3_AUTO2(3, "Auto2", "Auto 2", new byte[] { 0x00, 0x03 }),
-    CAT3_MANUAL(3, "Manual", null, new byte[] { 0x00, 0x01 }),
-    CAT3_OFF(3, "Off", null, new byte[] { 0x00, 0x00 }),
+    CAT3_AUTO1(3, "Auto1", new byte[] { 0x00, 0x02 }),
+    CAT3_AUTO2(3, "Auto2", new byte[] { 0x00, 0x03 }),
+    CAT3_MANUAL(3, "Manual", new byte[] { 0x00, 0x01 }),
+    CAT3_OFF(3, "Off", new byte[] { 0x00, 0x00 }),
 
     // Category 4: VW100
-    CAT4_ON(4, "On", null, new byte[] { 0x00, 0x01 }),
-    CAT4_AUTO(4, "Auto", null, new byte[] { 0x00, 0x02 }),
-    CAT4_OFF(4, "Off", null, new byte[] { 0x00, 0x00 }),
+    CAT4_ON(4, "On", new byte[] { 0x00, 0x01 }),
+    CAT4_AUTO(4, "Auto", new byte[] { 0x00, 0x02 }),
+    CAT4_OFF(4, "Off", new byte[] { 0x00, 0x00 }),
 
     // Category 5: VW1000ES, VW1100ES, HW50ES, HW55ES
-    CAT5_AUTO_FULL(5, "AutoFull", "Auto Full", new byte[] { 0x00, 0x02 }),
-    CAT5_AUTO_LIMITED(5, "AutoLimited", "Auto Limited", new byte[] { 0x00, 0x03 }),
-    CAT5_MANUAL(5, "Manual", null, new byte[] { 0x00, 0x01 }),
-    CAT5_OFF(5, "Off", null, new byte[] { 0x00, 0x00 });
+    CAT5_AUTO_FULL(5, "AutoFull", new byte[] { 0x00, 0x02 }),
+    CAT5_AUTO_LIMITED(5, "AutoLimited", new byte[] { 0x00, 0x03 }),
+    CAT5_MANUAL(5, "Manual", new byte[] { 0x00, 0x01 }),
+    CAT5_OFF(5, "Off", new byte[] { 0x00, 0x00 });
 
     private int category;
     private String name;
-    private @Nullable String label;
     private byte[] dataCode;
 
     /**
@@ -69,13 +67,11 @@ public enum SonyProjectorIrisMode {
      *
      * @param category a category of projector models for which the iris mode is available
      * @param name the name of the iris mode
-     * @param label the label of the iris mode; can be null when the label is identical to the name
      * @param dataCode the data code identifying the iris mode
      */
-    private SonyProjectorIrisMode(int category, String name, @Nullable String label, byte[] dataCode) {
+    private SonyProjectorIrisMode(int category, String name, byte[] dataCode) {
         this.category = category;
         this.name = name;
-        this.label = label;
         this.dataCode = dataCode;
     }
 
@@ -97,15 +93,6 @@ public enum SonyProjectorIrisMode {
         return dataCode;
     }
 
-    /**
-     * Get the label of the current iris mode
-     *
-     * @return the label
-     */
-    public @Nullable String getLabel() {
-        return label;
-    }
-
     /**
      * Get the name of the current iris mode
      *
@@ -128,8 +115,7 @@ public enum SonyProjectorIrisMode {
         List<StateOption> options = new ArrayList<>();
         for (SonyProjectorIrisMode value : SonyProjectorIrisMode.values()) {
             if (value.getCategory() == category) {
-                options.add(new StateOption(value.getName(),
-                        value.getLabel() != null ? value.getLabel() : value.getName()));
+                options.add(new StateOption(value.getName(), value.getName()));
             }
         }
         return options;
diff --git a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorMotionEnhancer.java b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorMotionEnhancer.java
index acb3a1754d0..15fb3672502 100644
--- a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorMotionEnhancer.java
+++ b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorMotionEnhancer.java
@@ -17,7 +17,6 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.sonyprojector.internal.SonyProjectorException;
 import org.openhab.core.types.StateOption;
 import org.openhab.core.util.HexUtils;
@@ -32,27 +31,26 @@ public enum SonyProjectorMotionEnhancer {
 
     // Category 1: VW260, VW285, VW300, VW315, VW320, VW328, VW350, VW360, VW365, VW385, VW500, VW515, VW520, VW528,
     // VW570, VW600, VW665, VW675, VW695, VW760, VW870, VW885, VW995, HW45ES, HW60, HW65, HW68
-    CAT1_SMOOTH_HIGH(1, "SmoothHigh", "Smooth High", new byte[] { 0x00, 0x01 }),
-    CAT1_SMOOTH_LOW(1, "SmoothLow", "Smooth Low", new byte[] { 0x00, 0x02 }),
-    CAT1_IMPULSE(1, "Impulse", null, new byte[] { 0x00, 0x03 }),
-    CAT1_COMBINATION(1, "Combination", null, new byte[] { 0x00, 0x04 }),
-    CAT1_TRUE_CINEMA(1, "TrueCinema", "True Cinema", new byte[] { 0x00, 0x05 }),
-    CAT1_OFF(1, "Off", null, new byte[] { 0x00, 0x00 }),
+    CAT1_SMOOTH_HIGH(1, "SmoothHigh", new byte[] { 0x00, 0x01 }),
+    CAT1_SMOOTH_LOW(1, "SmoothLow", new byte[] { 0x00, 0x02 }),
+    CAT1_IMPULSE(1, "Impulse", new byte[] { 0x00, 0x03 }),
+    CAT1_COMBINATION(1, "Combination", new byte[] { 0x00, 0x04 }),
+    CAT1_TRUE_CINEMA(1, "TrueCinema", new byte[] { 0x00, 0x05 }),
+    CAT1_OFF(1, "Off", new byte[] { 0x00, 0x00 }),
 
     // Category 2: VW80, VW85, VW90, VW95, VW200, VW1000ES, VW1100ES, HW35ES, HW40ES, HW50ES, HW55ES, HW58ES
-    CAT2_HIGH(2, "High", null, new byte[] { 0x00, 0x02 }),
-    CAT2_LOW(2, "Low", null, new byte[] { 0x00, 0x01 }),
-    CAT2_OFF(2, "Off", null, new byte[] { 0x00, 0x00 }),
+    CAT2_HIGH(2, "High", new byte[] { 0x00, 0x02 }),
+    CAT2_LOW(2, "Low", new byte[] { 0x00, 0x01 }),
+    CAT2_OFF(2, "Off", new byte[] { 0x00, 0x00 }),
 
     // Category 3: VW270, VW295
-    CAT3_SMOOTH_HIGH(3, "SmoothHigh", "Smooth High", new byte[] { 0x00, 0x01 }),
-    CAT3_SMOOTH_LOW(3, "SmoothLow", "Smooth Low", new byte[] { 0x00, 0x02 }),
-    CAT3_TRUE_CINEMA(3, "TrueCinema", "True Cinema", new byte[] { 0x00, 0x05 }),
-    CAT3_OFF(3, "Off", null, new byte[] { 0x00, 0x00 });
+    CAT3_SMOOTH_HIGH(3, "SmoothHigh", new byte[] { 0x00, 0x01 }),
+    CAT3_SMOOTH_LOW(3, "SmoothLow", new byte[] { 0x00, 0x02 }),
+    CAT3_TRUE_CINEMA(3, "TrueCinema", new byte[] { 0x00, 0x05 }),
+    CAT3_OFF(3, "Off", new byte[] { 0x00, 0x00 });
 
     private int category;
     private String name;
-    private @Nullable String label;
     private byte[] dataCode;
 
     /**
@@ -60,13 +58,11 @@ public enum SonyProjectorMotionEnhancer {
      *
      * @param category a category of projector models for which the motion enhancer mode is available
      * @param name the name of the motion enhancer mode
-     * @param label the label of the motion enhancer mode; can be null when the label is identical to the name
      * @param dataCode the data code identifying the motion enhancer mode
      */
-    private SonyProjectorMotionEnhancer(int category, String name, @Nullable String label, byte[] dataCode) {
+    private SonyProjectorMotionEnhancer(int category, String name, byte[] dataCode) {
         this.category = category;
         this.name = name;
-        this.label = label;
         this.dataCode = dataCode;
     }
 
@@ -88,15 +84,6 @@ public enum SonyProjectorMotionEnhancer {
         return dataCode;
     }
 
-    /**
-     * Get the label of the current motion enhancer mode
-     *
-     * @return the label
-     */
-    public @Nullable String getLabel() {
-        return label;
-    }
-
     /**
      * Get the name of the current motion enhancer mode
      *
@@ -119,8 +106,7 @@ public enum SonyProjectorMotionEnhancer {
         List<StateOption> options = new ArrayList<>();
         for (SonyProjectorMotionEnhancer value : SonyProjectorMotionEnhancer.values()) {
             if (value.getCategory() == category) {
-                options.add(new StateOption(value.getName(),
-                        value.getLabel() != null ? value.getLabel() : value.getName()));
+                options.add(new StateOption(value.getName(), value.getName()));
             }
         }
         return options;
diff --git a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorMpegNr.java b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorMpegNr.java
index 52fea165d14..6a1a7b485fe 100644
--- a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorMpegNr.java
+++ b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorMpegNr.java
@@ -17,7 +17,6 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.sonyprojector.internal.SonyProjectorException;
 import org.openhab.core.types.StateOption;
 import org.openhab.core.util.HexUtils;
@@ -32,21 +31,20 @@ public enum SonyProjectorMpegNr {
 
     // Category 1: VW260, VW270, VW285, VW295, VW315, VW320, VW328, VW365, VW>385, VW500, VW515, VW520, VW528, VW550,
     // VW570, VW600, VW665, VW675, VW695, VW760, VW870, VW885, VW995, HW60, HW65, HW68
-    CAT1_AUTO(1, "Auto", null, new byte[] { 0x00, 0x04 }),
-    CAT1_HIGH(1, "High", null, new byte[] { 0x00, 0x03 }),
-    CAT1_MIDDLE(1, "Middle", null, new byte[] { 0x00, 0x02 }),
-    CAT1_LOW(1, "Low", null, new byte[] { 0x00, 0x01 }),
-    CAT1_OFF(1, "Off", null, new byte[] { 0x00, 0x00 }),
+    CAT1_AUTO(1, "Auto", new byte[] { 0x00, 0x04 }),
+    CAT1_HIGH(1, "High", new byte[] { 0x00, 0x03 }),
+    CAT1_MIDDLE(1, "Middle", new byte[] { 0x00, 0x02 }),
+    CAT1_LOW(1, "Low", new byte[] { 0x00, 0x01 }),
+    CAT1_OFF(1, "Off", new byte[] { 0x00, 0x00 }),
 
     // Category 2: HW35ES, HW40ES, HW45ES, HW50ES, HW55ES, HW58ES
-    CAT2_HIGH(2, "High", null, new byte[] { 0x00, 0x03 }),
-    CAT2_MIDDLE(2, "Middle", null, new byte[] { 0x00, 0x02 }),
-    CAT2_LOW(2, "Low", null, new byte[] { 0x00, 0x01 }),
-    CAT2_OFF(2, "Off", null, new byte[] { 0x00, 0x00 });
+    CAT2_HIGH(2, "High", new byte[] { 0x00, 0x03 }),
+    CAT2_MIDDLE(2, "Middle", new byte[] { 0x00, 0x02 }),
+    CAT2_LOW(2, "Low", new byte[] { 0x00, 0x01 }),
+    CAT2_OFF(2, "Off", new byte[] { 0x00, 0x00 });
 
     private int category;
     private String name;
-    private @Nullable String label;
     private byte[] dataCode;
 
     /**
@@ -54,13 +52,11 @@ public enum SonyProjectorMpegNr {
      *
      * @param category a category of projector models for which the MPEG noise reduction mode is available
      * @param name the name of the MPEG noise reduction mode
-     * @param label the label of the MPEG noise reduction mode; can be null when the label is identical to the name
      * @param dataCode the data code identifying the MPEG noise reduction mode
      */
-    private SonyProjectorMpegNr(int category, String name, @Nullable String label, byte[] dataCode) {
+    private SonyProjectorMpegNr(int category, String name, byte[] dataCode) {
         this.category = category;
         this.name = name;
-        this.label = label;
         this.dataCode = dataCode;
     }
 
@@ -82,15 +78,6 @@ public enum SonyProjectorMpegNr {
         return dataCode;
     }
 
-    /**
-     * Get the label of the current MPEG noise reduction mode
-     *
-     * @return the label
-     */
-    public @Nullable String getLabel() {
-        return label;
-    }
-
     /**
      * Get the name of the current MPEG noise reduction mode
      *
@@ -113,8 +100,7 @@ public enum SonyProjectorMpegNr {
         List<StateOption> options = new ArrayList<>();
         for (SonyProjectorMpegNr value : SonyProjectorMpegNr.values()) {
             if (value.getCategory() == category) {
-                options.add(new StateOption(value.getName(),
-                        value.getLabel() != null ? value.getLabel() : value.getName()));
+                options.add(new StateOption(value.getName(), value.getName()));
             }
         }
         return options;
diff --git a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorNr.java b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorNr.java
index 6155f0a3463..b6bb5305860 100644
--- a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorNr.java
+++ b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorNr.java
@@ -17,7 +17,6 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.sonyprojector.internal.SonyProjectorException;
 import org.openhab.core.types.StateOption;
 import org.openhab.core.util.HexUtils;
@@ -32,22 +31,21 @@ public enum SonyProjectorNr {
 
     // Category 1: VW260, VW270, VW285, VW295, VW300, VW315, VW320, VW328, VW350, VW365, VW385, VW500, VW515, VW520,
     // VW528, VW550, VW570, VW600, VW665, VW675, VW695, VW760, VW870, VW885, VW995, HW60, HW65, HW68
-    CAT1_AUTO(1, "Auto", null, new byte[] { 0x00, 0x04 }),
-    CAT1_HIGH(1, "High", null, new byte[] { 0x00, 0x03 }),
-    CAT1_MIDDLE(1, "Middle", null, new byte[] { 0x00, 0x02 }),
-    CAT1_LOW(1, "Low", null, new byte[] { 0x00, 0x01 }),
-    CAT1_OFF(1, "Off", null, new byte[] { 0x00, 0x00 }),
+    CAT1_AUTO(1, "Auto", new byte[] { 0x00, 0x04 }),
+    CAT1_HIGH(1, "High", new byte[] { 0x00, 0x03 }),
+    CAT1_MIDDLE(1, "Middle", new byte[] { 0x00, 0x02 }),
+    CAT1_LOW(1, "Low", new byte[] { 0x00, 0x01 }),
+    CAT1_OFF(1, "Off", new byte[] { 0x00, 0x00 }),
 
     // Category 2: VW40, VW50, VW60, VW70, VW80, VW85, VW90, VW95, VW100, VW200, VW1000ES, VW1100ES,
     // HW10, HW15, HW20, HW30ES, HW35ES, HW40ES, HW45ES, HW50ES, HW55ES, HW58ES
-    CAT2_HIGH(2, "High", null, new byte[] { 0x00, 0x03 }),
-    CAT2_MIDDLE(2, "Middle", null, new byte[] { 0x00, 0x02 }),
-    CAT2_LOW(2, "Low", null, new byte[] { 0x00, 0x01 }),
-    CAT2_OFF(2, "Off", null, new byte[] { 0x00, 0x00 });
+    CAT2_HIGH(2, "High", new byte[] { 0x00, 0x03 }),
+    CAT2_MIDDLE(2, "Middle", new byte[] { 0x00, 0x02 }),
+    CAT2_LOW(2, "Low", new byte[] { 0x00, 0x01 }),
+    CAT2_OFF(2, "Off", new byte[] { 0x00, 0x00 });
 
     private int category;
     private String name;
-    private @Nullable String label;
     private byte[] dataCode;
 
     /**
@@ -55,13 +53,11 @@ public enum SonyProjectorNr {
      *
      * @param category a category of projector models for which the noise reduction mode is available
      * @param name the name of the noise reduction mode
-     * @param label the label of the noise reduction mode; can be null when the label is identical to the name
      * @param dataCode the data code identifying the noise reduction mode
      */
-    private SonyProjectorNr(int category, String name, @Nullable String label, byte[] dataCode) {
+    private SonyProjectorNr(int category, String name, byte[] dataCode) {
         this.category = category;
         this.name = name;
-        this.label = label;
         this.dataCode = dataCode;
     }
 
@@ -83,15 +79,6 @@ public enum SonyProjectorNr {
         return dataCode;
     }
 
-    /**
-     * Get the label of the current noise reduction mode
-     *
-     * @return the label
-     */
-    public @Nullable String getLabel() {
-        return label;
-    }
-
     /**
      * Get the name of the current noise reduction mode
      *
@@ -114,8 +101,7 @@ public enum SonyProjectorNr {
         List<StateOption> options = new ArrayList<>();
         for (SonyProjectorNr value : SonyProjectorNr.values()) {
             if (value.getCategory() == category) {
-                options.add(new StateOption(value.getName(),
-                        value.getLabel() != null ? value.getLabel() : value.getName()));
+                options.add(new StateOption(value.getName(), value.getName()));
             }
         }
         return options;
diff --git a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorPicturePosition.java b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorPicturePosition.java
index a266dc15acb..4ef18e286e8 100644
--- a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorPicturePosition.java
+++ b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorPicturePosition.java
@@ -17,7 +17,6 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.sonyprojector.internal.SonyProjectorException;
 import org.openhab.core.types.StateOption;
 import org.openhab.core.util.HexUtils;
@@ -32,22 +31,21 @@ public enum SonyProjectorPicturePosition {
 
     // Category 1: VW385, VW500, VW515, VW520, VW528, VW550, VW570, VW600, VW665, VW675, VW695, VW760, VW870, VW885,
     // VW995, VW1000ES, VW1100ES
-    CAT1_185(1, "185", "1.85:1", new byte[] { 0x00, 0x00 }),
-    CAT1_235(1, "235", "2.35:1", new byte[] { 0x00, 0x01 }),
-    CAT1_CUSTOM1(1, "Custom1", "Custom 1", new byte[] { 0x00, 0x02 }),
-    CAT1_CUSTOM2(1, "Custom2", "Custom 2", new byte[] { 0x00, 0x03 }),
-    CAT1_CUSTOM3(1, "Custom3", "Custom 3", new byte[] { 0x00, 0x04 }),
+    CAT1_185(1, "185", new byte[] { 0x00, 0x00 }),
+    CAT1_235(1, "235", new byte[] { 0x00, 0x01 }),
+    CAT1_CUSTOM1(1, "Custom1", new byte[] { 0x00, 0x02 }),
+    CAT1_CUSTOM2(1, "Custom2", new byte[] { 0x00, 0x03 }),
+    CAT1_CUSTOM3(1, "Custom3", new byte[] { 0x00, 0x04 }),
 
     // Category 2: VW95
-    CAT2_POSITION1(2, "Position1", "Position 1", new byte[] { 0x00, 0x00 }),
-    CAT2_POSITION2(2, "Position2", "Position 2", new byte[] { 0x00, 0x01 }),
-    CAT2_POSITION3(2, "Position3", "Position 3", new byte[] { 0x00, 0x02 }),
-    CAT2_POSITION4(2, "Position4", "Position 4", new byte[] { 0x00, 0x03 }),
-    CAT2_POSITION5(2, "Position5", "Position 5", new byte[] { 0x00, 0x04 });
+    CAT2_POSITION1(2, "Position1", new byte[] { 0x00, 0x00 }),
+    CAT2_POSITION2(2, "Position2", new byte[] { 0x00, 0x01 }),
+    CAT2_POSITION3(2, "Position3", new byte[] { 0x00, 0x02 }),
+    CAT2_POSITION4(2, "Position4", new byte[] { 0x00, 0x03 }),
+    CAT2_POSITION5(2, "Position5", new byte[] { 0x00, 0x04 });
 
     private int category;
     private String name;
-    private @Nullable String label;
     private byte[] dataCode;
 
     /**
@@ -55,13 +53,11 @@ public enum SonyProjectorPicturePosition {
      *
      * @param category a category of projector models for which the picture position is available
      * @param name the name of the picture position
-     * @param label the label of the picture position; can be null when the label is identical to the name
      * @param dataCode the data code identifying the picture position
      */
-    private SonyProjectorPicturePosition(int category, String name, @Nullable String label, byte[] dataCode) {
+    private SonyProjectorPicturePosition(int category, String name, byte[] dataCode) {
         this.category = category;
         this.name = name;
-        this.label = label;
         this.dataCode = dataCode;
     }
 
@@ -83,15 +79,6 @@ public enum SonyProjectorPicturePosition {
         return dataCode;
     }
 
-    /**
-     * Get the label of the current picture position
-     *
-     * @return the label
-     */
-    public @Nullable String getLabel() {
-        return label;
-    }
-
     /**
      * Get the name of the current picture position
      *
@@ -114,8 +101,7 @@ public enum SonyProjectorPicturePosition {
         List<StateOption> options = new ArrayList<>();
         for (SonyProjectorPicturePosition value : SonyProjectorPicturePosition.values()) {
             if (value.getCategory() == category) {
-                options.add(new StateOption(value.getName(),
-                        value.getLabel() != null ? value.getLabel() : value.getName()));
+                options.add(new StateOption(value.getName(), value.getName()));
             }
         }
         return options;
diff --git a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorStatusPower.java b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorStatusPower.java
index 104e76c2d00..f4b20987731 100644
--- a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorStatusPower.java
+++ b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorStatusPower.java
@@ -27,29 +27,26 @@ import org.openhab.core.util.HexUtils;
 @NonNullByDefault
 public enum SonyProjectorStatusPower {
 
-    STANDBY("Standby", new byte[] { 0x00, 0x00 }, false),
-    START_UP("Start Up", new byte[] { 0x00, 0x01 }, true),
-    STARTUP_LAMP("Sartup Lamp", new byte[] { 0x00, 0x02 }, true),
-    POWER_ON("Power On", new byte[] { 0x00, 0x03 }, true),
-    COOLING1("Cooling1", new byte[] { 0x00, 0x04 }, false),
-    COOLING2("Cooling1", new byte[] { 0x00, 0x05 }, false),
-    SAVING_COOLING1("Saving Cooling1", new byte[] { 0x00, 0x06 }, false),
-    SAVING_COOLING2("Saving Cooling2", new byte[] { 0x00, 0x07 }, false),
-    SAVING_STANDBY("Saving Standby", new byte[] { 0x00, 0x08 }, false);
+    STANDBY(new byte[] { 0x00, 0x00 }, false),
+    START_UP(new byte[] { 0x00, 0x01 }, true),
+    STARTUP_LAMP(new byte[] { 0x00, 0x02 }, true),
+    POWER_ON(new byte[] { 0x00, 0x03 }, true),
+    COOLING1(new byte[] { 0x00, 0x04 }, false),
+    COOLING2(new byte[] { 0x00, 0x05 }, false),
+    SAVING_COOLING1(new byte[] { 0x00, 0x06 }, false),
+    SAVING_COOLING2(new byte[] { 0x00, 0x07 }, false),
+    SAVING_STANDBY(new byte[] { 0x00, 0x08 }, false);
 
-    private String name;
     private byte[] dataCode;
     private boolean on;
 
     /**
      * Constructor
      *
-     * @param name the name of the power status
      * @param dataCode the data code identifying the power status
      * @param on the associated ON or OFF status of the power status
      */
-    private SonyProjectorStatusPower(String name, byte[] dataCode, boolean on) {
-        this.name = name;
+    private SonyProjectorStatusPower(byte[] dataCode, boolean on) {
         this.dataCode = dataCode;
         this.on = on;
     }
@@ -63,15 +60,6 @@ public enum SonyProjectorStatusPower {
         return dataCode;
     }
 
-    /**
-     * Get the name of the current power status
-     *
-     * @return the name
-     */
-    public String getName() {
-        return name;
-    }
-
     /**
      * Get the associated ON or OFF status of the current power status
      *
diff --git a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/handler/SonyProjectorHandler.java b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/handler/SonyProjectorHandler.java
index a530ae53dbd..52fb9c5ffca 100644
--- a/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/handler/SonyProjectorHandler.java
+++ b/bundles/org.openhab.binding.sonyprojector/src/main/java/org/openhab/binding/sonyprojector/internal/handler/SonyProjectorHandler.java
@@ -304,10 +304,10 @@ public class SonyProjectorHandler extends BaseThingHandler {
             logger.debug("Ethernet config community {}", config.community);
             if (config.host == null || config.host.isEmpty()) {
                 updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR,
-                        "host configuration setting undefined");
+                        "@text/offline.config-error-unknown-host");
             } else if (configModel == null || configModel.isEmpty()) {
                 updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR,
-                        "model configuration setting undefined");
+                        "@text/offline.config-error-unknown-model");
             } else {
                 configOk = true;
 
@@ -325,13 +325,13 @@ public class SonyProjectorHandler extends BaseThingHandler {
             logger.debug("Serial config model {}", configModel);
             if (config.port == null || config.port.isEmpty()) {
                 updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR,
-                        "port configuration setting undefined");
+                        "@text/ofline.config-error-unknown-port");
             } else if (config.port.toLowerCase().startsWith("rfc2217")) {
                 updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR,
-                        "use Serial over IP connection thing type");
+                        "@text/ofline.config-error-invalid-thing-type");
             } else if (configModel == null || configModel.isEmpty()) {
                 updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR,
-                        "model configuration setting undefined");
+                        "@text/offline.config-error-unknown-model");
             } else {
                 configOk = true;
 
@@ -350,16 +350,16 @@ public class SonyProjectorHandler extends BaseThingHandler {
             logger.debug("Serial over IP config model {}", configModel);
             if (config.host == null || config.host.isEmpty()) {
                 updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR,
-                        "host configuration setting undefined");
+                        "@text/offline.config-error-unknown-host");
             } else if (config.port == null) {
                 updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR,
-                        "port configuration setting undefined");
+                        "@text/ofline.config-error-unknown-port");
             } else if (config.port <= 0) {
                 updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR,
-                        "port configuration setting invalid");
+                        "@text/ofline.config-error-invalid-port");
             } else if (configModel == null || configModel.isEmpty()) {
                 updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR,
-                        "model configuration setting undefined");
+                        "@text/offline.config-error-unknown-model");
             } else {
                 configOk = true;
 
@@ -522,7 +522,7 @@ public class SonyProjectorHandler extends BaseThingHandler {
             SonyProjectorStatusPower value = connector.getStatusPower();
             logger.debug("Get Status Power returned {}", value);
             on = value.isOn();
-            state = new StringType(value.getName());
+            state = new StringType(value.name());
         } catch (SonyProjectorException e) {
             logger.debug("Get Status Power failed: {}", e.getMessage());
         }
@@ -608,7 +608,7 @@ public class SonyProjectorHandler extends BaseThingHandler {
                             state = connector.getStatusPower().isOn() ? OnOffType.ON : OnOffType.OFF;
                             break;
                         case CHANNEL_POWERSTATE:
-                            state = new StringType(connector.getStatusPower().getName());
+                            state = new StringType(connector.getStatusPower().name());
                             break;
                         case CHANNEL_INPUT:
                             state = new StringType(connector.getInput());
diff --git a/bundles/org.openhab.binding.sonyprojector/src/main/resources/OH-INF/i18n/sonyprojector.properties b/bundles/org.openhab.binding.sonyprojector/src/main/resources/OH-INF/i18n/sonyprojector.properties
new file mode 100644
index 00000000000..adab7ef1971
--- /dev/null
+++ b/bundles/org.openhab.binding.sonyprojector/src/main/resources/OH-INF/i18n/sonyprojector.properties
@@ -0,0 +1,295 @@
+# binding
+binding.sonyprojector.name = SonyProjector Binding
+binding.sonyprojector.description = The SonyProjector binding controls a Sony projector through Ethernet (PJ Talk) or serial.
+
+# thing types
+
+thing-type.sonyprojector.ethernetconnection.label = Sony Ethernet Connection
+thing-type.sonyprojector.ethernetconnection.description = Ethernet connection to the Sony projector using PJ Talk
+
+thing-type.sonyprojector.serialconnection.label = Sony Serial Connection
+thing-type.sonyprojector.serialconnection.description = Serial connection to the Sony projector
+
+thing-type.sonyprojector.serialoveripconnection.label = Sony Serial over IP Connection
+thing-type.sonyprojector.serialoveripconnection.description = Serial over IP connection to the Sony projector
+
+# thing type configuration
+thing-type.config.sonyprojector.ethernetconnection.host.label = Address
+thing-type.config.sonyprojector.ethernetconnection.host.description = Host name or IP address of the projector.
+
+thing-type.config.sonyprojector.ethernetconnection.port.label = Port
+thing-type.config.sonyprojector.ethernetconnection.port.description = Communication port. Default is 53484.
+
+thing-type.config.sonyprojector.ethernetconnection.model.label = Model
+thing-type.config.sonyprojector.ethernetconnection.model.description = Projector model to be controlled. Default is AUTO.
+thing-type.config.sonyprojector.ethernetconnection.model.option.AUTO = Automatic
+
+thing-type.config.sonyprojector.ethernetconnection.community.label = Community
+thing-type.config.sonyprojector.ethernetconnection.community.description = Community of the projector. Length must be 4 characters. Default is SONY.
+
+thing-type.config.sonyprojector.serialconnection.port.label = Serial Port
+thing-type.config.sonyprojector.serialconnection.port.description = Serial port to use for connecting to the projector.
+
+thing-type.config.sonyprojector.serialconnection.model.label = Model
+thing-type.config.sonyprojector.serialconnection.model.description = Projector model to be controlled.
+
+thing-type.config.sonyprojector.serialoveripconnection.host.label = Address
+thing-type.config.sonyprojector.serialoveripconnection.host.description = Host name or IP address of the machine connected to the projector.
+
+thing-type.config.sonyprojector.serialoveripconnection.port.label = Port
+thing-type.config.sonyprojector.serialoveripconnection.port.description = Communication port.
+
+thing-type.config.sonyprojector.serialoveripconnection.model.label = Model
+thing-type.config.sonyprojector.serialoveripconnection.model.description = Projector model to be controlled.
+
+# channel type
+
+channel-type.sonyprojector.power.label = Power State
+channel-type.sonyprojector.power.description = Current detailed power state of the projector
+
+channel-type.sonyprojector.powerstate.label = Power State
+channel-type.sonyprojector.powerstate.description = Current detailed power state of the projector
+channel-type.sonyprojector.powerstate.state.option.STANDBY = Standby
+channel-type.sonyprojector.powerstate.state.option.START_UP = Start Up
+channel-type.sonyprojector.powerstate.state.option.STARTUP_LAMP = Sartup Lamp
+channel-type.sonyprojector.powerstate.state.option.POWER_ON = Power On
+channel-type.sonyprojector.powerstate.state.option.COOLING1 = Cooling 1
+channel-type.sonyprojector.powerstate.state.option.COOLING2 = Cooling 2
+channel-type.sonyprojector.powerstate.state.option.SAVING_COOLING1 = Saving Cooling 1
+channel-type.sonyprojector.powerstate.state.option.SAVING_COOLING2 = Saving Cooling 2
+channel-type.sonyprojector.powerstate.state.option.SAVING_STANDBY = Saving Standby
+
+channel-type.sonyprojector.input.label = Video Input
+channel-type.sonyprojector.input.description = Select the equipment from which to display images
+channel-type.sonyprojector.input.state.option.HDMI = HDMI
+channel-type.sonyprojector.input.state.option.HDMI1 = HDMI 1
+channel-type.sonyprojector.input.state.option.HDMI2 = HDMI 2
+channel-type.sonyprojector.input.state.option.DVI = DVI
+channel-type.sonyprojector.input.state.option.Video = Video
+channel-type.sonyprojector.input.state.option.SVideo = S-Video
+channel-type.sonyprojector.input.state.option.InputA = Input A
+channel-type.sonyprojector.input.state.option.Component = Component
+
+channel-type.sonyprojector.calibrationpreset.label = Calibrated Preset
+channel-type.sonyprojector.calibrationpreset.description = Adjust the picture viewing mode by selecting one of the preset modes
+channel-type.sonyprojector.calibrationpreset.state.option.Film1 = Cinema Film 1
+channel-type.sonyprojector.calibrationpreset.state.option.Film2 = Cinema Film 2
+channel-type.sonyprojector.calibrationpreset.state.option.Reference = Reference
+channel-type.sonyprojector.calibrationpreset.state.option.TV = TV
+channel-type.sonyprojector.calibrationpreset.state.option.Photo = Photo
+channel-type.sonyprojector.calibrationpreset.state.option.Game = Game
+channel-type.sonyprojector.calibrationpreset.state.option.BRTCINE = Bright Cinema
+channel-type.sonyprojector.calibrationpreset.state.option.BRTTV = Bright TV
+channel-type.sonyprojector.calibrationpreset.state.option.Dynamic = Dynamic
+channel-type.sonyprojector.calibrationpreset.state.option.Standard = Standard
+channel-type.sonyprojector.calibrationpreset.state.option.Cinema = Cinema
+channel-type.sonyprojector.calibrationpreset.state.option.Cinema1 = Cinema 1
+channel-type.sonyprojector.calibrationpreset.state.option.Cinema2 = Cinema 2
+channel-type.sonyprojector.calibrationpreset.state.option.Cinema3 = Cinema 3
+channel-type.sonyprojector.calibrationpreset.state.option.User = User
+channel-type.sonyprojector.calibrationpreset.state.option.User1 = User 1
+channel-type.sonyprojector.calibrationpreset.state.option.User2 = User 2
+channel-type.sonyprojector.calibrationpreset.state.option.User3 = User 3
+channel-type.sonyprojector.calibrationpreset.state.option.Digital = Cinema Digital
+
+channel-type.sonyprojector.contrast.label = Contrast
+channel-type.sonyprojector.contrast.description = Adjust the contrast of the picture
+
+channel-type.sonyprojector.brightness.label = Brightness
+channel-type.sonyprojector.brightness.description = Adjust the brightness of the picture
+
+channel-type.sonyprojector.color.label = Color
+channel-type.sonyprojector.color.description = Adjust the color density
+
+channel-type.sonyprojector.hue.label = Hue
+channel-type.sonyprojector.hue.description = Adjust the color tone
+
+channel-type.sonyprojector.sharpness.label = Sharpness
+channel-type.sonyprojector.sharpness.description = Sharpen the outline of the picture or reduce the noise
+
+channel-type.sonyprojector.colortemperature.label = Color Temperature
+channel-type.sonyprojector.colortemperature.description = Adjust the color temperature
+channel-type.sonyprojector.colortemperature.state.option.D93 = D93
+channel-type.sonyprojector.colortemperature.state.option.D75 = D75
+channel-type.sonyprojector.colortemperature.state.option.D65 = D65
+channel-type.sonyprojector.colortemperature.state.option.D55 = D55
+channel-type.sonyprojector.colortemperature.state.option.DCI = DCI
+channel-type.sonyprojector.colortemperature.state.option.High = High
+channel-type.sonyprojector.colortemperature.state.option.Middle = Middle
+channel-type.sonyprojector.colortemperature.state.option.Low = Low
+channel-type.sonyprojector.colortemperature.state.option.Low1 = Low 1
+channel-type.sonyprojector.colortemperature.state.option.Low2 = Low 2
+channel-type.sonyprojector.colortemperature.state.option.Custom = Custom
+channel-type.sonyprojector.colortemperature.state.option.Custom1 = Custom 1
+channel-type.sonyprojector.colortemperature.state.option.Custom2 = Custom 2
+channel-type.sonyprojector.colortemperature.state.option.Custom3 = Custom 3
+channel-type.sonyprojector.colortemperature.state.option.Custom4 = Custom 4
+channel-type.sonyprojector.colortemperature.state.option.Custom5 = Custom 5
+
+channel-type.sonyprojector.irismode.label = Iris Mode
+channel-type.sonyprojector.irismode.description = Switch the iris aperture function
+channel-type.sonyprojector.irismode.state.option.Full = Full
+channel-type.sonyprojector.irismode.state.option.Limited = Limited
+channel-type.sonyprojector.irismode.state.option.AutoFull = Auto Full
+channel-type.sonyprojector.irismode.state.option.AutoLimited = Auto Limited
+channel-type.sonyprojector.irismode.state.option.Auto = Automatic
+channel-type.sonyprojector.irismode.state.option.Auto1 = Automatic 1
+channel-type.sonyprojector.irismode.state.option.Auto2 = Automatic 2
+channel-type.sonyprojector.irismode.state.option.Manual = Manual
+channel-type.sonyprojector.irismode.state.option.On = On
+channel-type.sonyprojector.irismode.state.option.Off = Off
+
+channel-type.sonyprojector.irismanual.label = Iris Manual
+channel-type.sonyprojector.irismanual.description = Force the iris aperture to a fixed value
+
+channel-type.sonyprojector.irissensitivity.label = Iris Sensitivity
+channel-type.sonyprojector.irissensitivity.description = Select the iris sensitivity
+channel-type.sonyprojector.irissensitivity.state.option.Recommend = Recommend
+channel-type.sonyprojector.irissensitivity.state.option.Fast = Fast
+channel-type.sonyprojector.irissensitivity.state.option.Slow = Slow
+
+channel-type.sonyprojector.lampcontrol.label = Lamp Control
+channel-type.sonyprojector.lampcontrol.description = Switch the lamp output
+channel-type.sonyprojector.lampcontrol.state.option.High = High
+channel-type.sonyprojector.lampcontrol.state.option.Low = Low
+
+channel-type.sonyprojector.filmprojection.label = Film Projection
+channel-type.sonyprojector.filmprojection.description = Reproduce an image similar to that of projected film
+channel-type.sonyprojector.filmprojection.state.option.Mode1 = Mode 1
+channel-type.sonyprojector.filmprojection.state.option.Mode2 = Mode 2
+channel-type.sonyprojector.filmprojection.state.option.Mode3 = Mode 3
+channel-type.sonyprojector.filmprojection.state.option.On = On
+channel-type.sonyprojector.filmprojection.state.option.Off = Off
+
+channel-type.sonyprojector.motionenhancer.label = Motion Enhancer
+channel-type.sonyprojector.motionenhancer.description = Reproduce fast-moving pictures smoothly without generating afterimages
+channel-type.sonyprojector.motionenhancer.state.option.High = High
+channel-type.sonyprojector.motionenhancer.state.option.Low = Low
+channel-type.sonyprojector.motionenhancer.state.option.SmoothHigh = Smooth High
+channel-type.sonyprojector.motionenhancer.state.option.SmoothLow = Smooth Low
+channel-type.sonyprojector.motionenhancer.state.option.TrueCinema = True Cinema
+channel-type.sonyprojector.motionenhancer.state.option.Impulse = Impulse
+channel-type.sonyprojector.motionenhancer.state.option.Combination = Combination
+channel-type.sonyprojector.motionenhancer.state.option.Off = Off
+
+channel-type.sonyprojector.contrastenhancer.label = Contrast Enhancer
+channel-type.sonyprojector.contrastenhancer.description = Correct the level of bright and dark parts automatically
+channel-type.sonyprojector.contrastenhancer.state.option.High = High
+channel-type.sonyprojector.contrastenhancer.state.option.Middle = Middle
+channel-type.sonyprojector.contrastenhancer.state.option.Low = Low
+channel-type.sonyprojector.contrastenhancer.state.option.Off = Off
+
+channel-type.sonyprojector.filmmode.label = Film Mode
+channel-type.sonyprojector.filmmode.description = Select the playback mode for film sources
+channel-type.sonyprojector.filmmode.state.option.Auto = Auto
+channel-type.sonyprojector.filmmode.state.option.Auto1 = Auto 1
+channel-type.sonyprojector.filmmode.state.option.Auto2 = Auto 2
+channel-type.sonyprojector.filmmode.state.option.Off = Off
+
+channel-type.sonyprojector.gammacorrection.label = Gamma Correction
+channel-type.sonyprojector.gammacorrection.description = Adjust the response characteristics of the tone of the picture
+channel-type.sonyprojector.gammacorrection.state.option.Gamma1 = Gamma 1
+channel-type.sonyprojector.gammacorrection.state.option.Gamma2 = Gamma 2
+channel-type.sonyprojector.gammacorrection.state.option.Gamma3 = Gamma 3
+channel-type.sonyprojector.gammacorrection.state.option.Gamma4 = Gamma 4
+channel-type.sonyprojector.gammacorrection.state.option.Gamma5 = Gamma 5
+channel-type.sonyprojector.gammacorrection.state.option.Gamma6 = Gamma 6
+channel-type.sonyprojector.gammacorrection.state.option.Gamma7 = Gamma 7
+channel-type.sonyprojector.gammacorrection.state.option.Gamma8 = Gamma 8
+channel-type.sonyprojector.gammacorrection.state.option.Gamma9 = Gamma 9
+channel-type.sonyprojector.gammacorrection.state.option.Gamma10 = Gamma 10
+channel-type.sonyprojector.gammacorrection.state.option.Off = Off
+
+channel-type.sonyprojector.colorspace.label = Color Space
+channel-type.sonyprojector.colorspace.description = Convert the color space
+channel-type.sonyprojector.colorspace.state.option.BT709 = BT.709
+channel-type.sonyprojector.colorspace.state.option.BT2020 = BT.2020
+channel-type.sonyprojector.colorspace.state.option.ColorSpace1 = Color Space 1
+channel-type.sonyprojector.colorspace.state.option.ColorSpace2 = Color Space 2
+channel-type.sonyprojector.colorspace.state.option.ColorSpace3 = Color Space 3
+channel-type.sonyprojector.colorspace.state.option.Custom = Custom
+channel-type.sonyprojector.colorspace.state.option.Normal = Normal
+channel-type.sonyprojector.colorspace.state.option.Wide = Wide
+channel-type.sonyprojector.colorspace.state.option.Wide1 = Wide 1
+channel-type.sonyprojector.colorspace.state.option.Wide2 = Wide 2
+channel-type.sonyprojector.colorspace.state.option.Wide3 = Wide 3
+channel-type.sonyprojector.colorspace.state.option.DCI = DCI
+channel-type.sonyprojector.colorspace.state.option.AdobeRGB = Adobe RGB
+
+channel-type.sonyprojector.nr.label = Noise Reduction
+channel-type.sonyprojector.nr.description = Reduce the roughness or noise of the picture
+channel-type.sonyprojector.nr.state.option.Auto = Automatic
+channel-type.sonyprojector.nr.state.option.High = High
+channel-type.sonyprojector.nr.state.option.Middle = Middle
+channel-type.sonyprojector.nr.state.option.Low = Low
+channel-type.sonyprojector.nr.state.option.Off = Off
+
+channel-type.sonyprojector.blocknr.label = Block Noise Reduction
+channel-type.sonyprojector.blocknr.description = Reduce digital noise that appears in mosaic-like pattern
+channel-type.sonyprojector.blocknr.state.option.High = High
+channel-type.sonyprojector.blocknr.state.option.Middle = Middle
+channel-type.sonyprojector.blocknr.state.option.Low = Low
+channel-type.sonyprojector.blocknr.state.option.Off = Off
+
+channel-type.sonyprojector.mosquitonr.label = Mosquito Noise Reduction
+channel-type.sonyprojector.mosquitonr.description = Reduce digital noise that appears near the outline of the picture
+channel-type.sonyprojector.mosquitonr.state.option.High = High
+channel-type.sonyprojector.mosquitonr.state.option.Middle = Middle
+channel-type.sonyprojector.mosquitonr.state.option.Low = Low
+channel-type.sonyprojector.mosquitonr.state.option.Off = Off
+
+channel-type.sonyprojector.mpegnr.label = MPEG Noise Reduction
+channel-type.sonyprojector.mpegnr.description = Reduce block noise and mosquito noise, in particular in digital signals
+channel-type.sonyprojector.mpegnr.state.option.Auto = Automatic
+channel-type.sonyprojector.mpegnr.state.option.High = High
+channel-type.sonyprojector.mpegnr.state.option.Middle = Middle
+channel-type.sonyprojector.mpegnr.state.option.Low = Low
+channel-type.sonyprojector.mpegnr.state.option.Off = Off
+
+channel-type.sonyprojector.xvcolor.label = x.v.Color
+channel-type.sonyprojector.xvcolor.description = Set this when playing back an x.v.Color video signal
+
+channel-type.sonyprojector.picturemuting.label = Picture Muting
+channel-type.sonyprojector.picturemuting.description = Mute or unmute the picture
+
+channel-type.sonyprojector.aspect.label = Aspect Ratio
+channel-type.sonyprojector.aspect.description = Set the aspect ratio of the picture to be displayed
+channel-type.sonyprojector.aspect.state.option.Normal = Normal
+channel-type.sonyprojector.aspect.state.option.VStretch = V Stretch
+channel-type.sonyprojector.aspect.state.option.185 = 1.85:1 Zoom
+channel-type.sonyprojector.aspect.state.option.235 = 2.35:1 Zoom
+channel-type.sonyprojector.aspect.state.option.Stretch = Stretch
+channel-type.sonyprojector.aspect.state.option.Squeeze = Squeeze
+channel-type.sonyprojector.aspect.state.option.Full = Full
+channel-type.sonyprojector.aspect.state.option.Full1 = Full 1
+channel-type.sonyprojector.aspect.state.option.Full2 = Full 2
+channel-type.sonyprojector.aspect.state.option.WideZoom = Wide Zoom
+channel-type.sonyprojector.aspect.state.option.Zoom = Zoom
+channel-type.sonyprojector.aspect.state.option.Anamorphic = Anamorphic
+channel-type.sonyprojector.aspect.state.option.Subtitle = Subtitle
+
+channel-type.sonyprojector.overscan.label = Overscan
+channel-type.sonyprojector.overscan.description = Hide or not the edges of the picture
+
+channel-type.sonyprojector.pictureposition.label = Picture Position
+channel-type.sonyprojector.pictureposition.description = Adjust the picture position
+channel-type.sonyprojector.pictureposition.state.option.185 = 1.85:1
+channel-type.sonyprojector.pictureposition.state.option.235 = 2.35:1
+channel-type.sonyprojector.pictureposition.state.option.Custom1 = Custom 1
+channel-type.sonyprojector.pictureposition.state.option.Custom2 = Custom 2
+channel-type.sonyprojector.pictureposition.state.option.Custom3 = Custom 3
+channel-type.sonyprojector.pictureposition.state.option.Position1 = Position 1
+channel-type.sonyprojector.pictureposition.state.option.Position2 = Position 2
+channel-type.sonyprojector.pictureposition.state.option.Position3 = Position 3
+channel-type.sonyprojector.pictureposition.state.option.Position4 = Position 4
+channel-type.sonyprojector.pictureposition.state.option.Position5 = Position 5
+
+channel-type.sonyprojector.lampusetime.label = Lamp Use Time
+channel-type.sonyprojector.lampusetime.description = Indicate how long the lamp has been turned on in hours
+
+# Thing status descriptions
+offline.config-error-unknown-host = Undefined host configuration setting
+ofline.config-error-unknown-port = Undefined port configuration setting
+ofline.config-error-invalid-port = Invalid port configuration setting
+offline.config-error-unknown-model = Undefined model configuration setting
+ofline.config-error-invalid-thing-type = Use serial over IP connection thing type
diff --git a/bundles/org.openhab.binding.sonyprojector/src/main/resources/OH-INF/i18n/sonyprojector_fr.properties b/bundles/org.openhab.binding.sonyprojector/src/main/resources/OH-INF/i18n/sonyprojector_fr.properties
index 359dc6d78a7..5da31c86369 100644
--- a/bundles/org.openhab.binding.sonyprojector/src/main/resources/OH-INF/i18n/sonyprojector_fr.properties
+++ b/bundles/org.openhab.binding.sonyprojector/src/main/resources/OH-INF/i18n/sonyprojector_fr.properties
@@ -47,6 +47,15 @@ channel-type.sonyprojector.power.description = Allume ou éteint le projecteur.
 
 channel-type.sonyprojector.powerstate.label = Etat alimentation
 channel-type.sonyprojector.powerstate.description = État actuel d'alimentation du projecteur.
+channel-type.sonyprojector.powerstate.state.option.STANDBY = En veille
+channel-type.sonyprojector.powerstate.state.option.START_UP = Démarrage
+channel-type.sonyprojector.powerstate.state.option.STARTUP_LAMP = Démarrage lampe
+channel-type.sonyprojector.powerstate.state.option.POWER_ON = Allumé
+channel-type.sonyprojector.powerstate.state.option.COOLING1 = Refroidissement 1
+channel-type.sonyprojector.powerstate.state.option.COOLING2 = Refroidissement 2
+channel-type.sonyprojector.powerstate.state.option.SAVING_COOLING1 = Economie refroidissement 1
+channel-type.sonyprojector.powerstate.state.option.SAVING_COOLING2 = Economie refroidissement 2
+channel-type.sonyprojector.powerstate.state.option.SAVING_STANDBY = Economie de veille
 
 channel-type.sonyprojector.input.label = Entrée
 channel-type.sonyprojector.input.description = Sélectionne le périphérique à partir duquel les images seront affichées.
@@ -58,7 +67,6 @@ channel-type.sonyprojector.input.state.option.Video = Vidéo
 channel-type.sonyprojector.input.state.option.SVideo = S-Vidéo
 channel-type.sonyprojector.input.state.option.InputA = Entrée A
 channel-type.sonyprojector.input.state.option.Component = Composante
-channel-type.sonyprojector.input.state.option.HDMI2 = HDMI 2
 
 channel-type.sonyprojector.calibrationpreset.label = Préréglage étalon
 channel-type.sonyprojector.calibrationpreset.description = Sélectionne le mode de visualisation de l'image en sélectionnant l'un des préréglages étalon.
@@ -171,9 +179,9 @@ channel-type.sonyprojector.contrastenhancer.state.option.Off = Désactivé
 
 channel-type.sonyprojector.filmmode.label = Mode film
 channel-type.sonyprojector.filmmode.description = Sélectionne le mode de lecture pour une source film.
-channel-type.sonyprojector.filmmode.state.option.Auto = Automatique
-channel-type.sonyprojector.filmmode.state.option.Auto1 = Automatique 1
-channel-type.sonyprojector.filmmode.state.option.Auto2 = Automatique 2
+channel-type.sonyprojector.filmmode.state.option.Auto = Auto
+channel-type.sonyprojector.filmmode.state.option.Auto1 = Auto 1
+channel-type.sonyprojector.filmmode.state.option.Auto2 = Auto 2
 channel-type.sonyprojector.filmmode.state.option.Off = Désactivé
 
 channel-type.sonyprojector.gammacorrection.label = Correction gamma
@@ -276,3 +284,10 @@ channel-type.sonyprojector.pictureposition.state.option.Position5 = Position 5
 
 channel-type.sonyprojector.lampusetime.label = Durée de lampe
 channel-type.sonyprojector.lampusetime.description = Indique la durée en heures pendant laquelle la lampe a été allumée (temps total d'utilisation).
+
+# Thing status descriptions
+offline.config-error-unknown-host = Paramètre d''hôte indéfini
+ofline.config-error-unknown-port = Paramètre de port indéfini
+ofline.config-error-invalid-port = Paramètre de port invalide
+offline.config-error-unknown-model = Paramètre de modèle indéfini
+ofline.config-error-invalid-thing-type = Utiliser le type connexion série sur IP
diff --git a/bundles/org.openhab.binding.sonyprojector/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.sonyprojector/src/main/resources/OH-INF/thing/channels.xml
index 092bf3a9188..ab774367807 100644
--- a/bundles/org.openhab.binding.sonyprojector/src/main/resources/OH-INF/thing/channels.xml
+++ b/bundles/org.openhab.binding.sonyprojector/src/main/resources/OH-INF/thing/channels.xml
@@ -12,7 +12,19 @@
 			<tag>Status</tag>
 			<tag>Power</tag>
 		</tags>
-		<state readOnly="true"></state>
+		<state readOnly="true">
+			<options>
+				<option value="STANDBY">Standby</option>
+				<option value="START_UP">Start Up</option>
+				<option value="STARTUP_LAMP">Sartup Lamp</option>
+				<option value="POWER_ON">Power On</option>
+				<option value="COOLING1">Cooling 1</option>
+				<option value="COOLING2">Cooling 2</option>
+				<option value="SAVING_COOLING1">Saving Cooling 1</option>
+				<option value="SAVING_COOLING2">Saving Cooling 2</option>
+				<option value="SAVING_STANDBY">Saving Standby</option>
+			</options>
+		</state>
 	</channel-type>
 
 	<channel-type id="input">