diff --git a/js/misc/modemManager.js b/js/misc/modemManager.js
index 5f727f3ca..c73c93e7f 100644
--- a/js/misc/modemManager.js
+++ b/js/misc/modemManager.js
@@ -117,13 +117,11 @@ var ModemBase = GObject.registerClass({
         this._signalQuality = 0;
     }
 
-    // eslint-disable-next-line camelcase
-    get operator_name() {
+    get operatorName() {
         return this._operatorName;
     }
 
-    // eslint-disable-next-line camelcase
-    get signal_quality() {
+    get signalQuality() {
         return this._signalQuality;
     }
 
diff --git a/js/misc/systemActions.js b/js/misc/systemActions.js
index 1cd657648..10cab9a9e 100644
--- a/js/misc/systemActions.js
+++ b/js/misc/systemActions.js
@@ -182,43 +182,35 @@ const SystemActions = GObject.registerClass({
         this._sessionUpdated();
     }
 
-    // eslint-disable-next-line camelcase
-    get can_power_off() {
+    get canPowerOff() {
         return this._actions.get(POWER_OFF_ACTION_ID).available;
     }
 
-    // eslint-disable-next-line camelcase
-    get can_restart() {
+    get canRestart() {
         return this._actions.get(RESTART_ACTION_ID).available;
     }
 
-    // eslint-disable-next-line camelcase
-    get can_suspend() {
+    get canSuspend() {
         return this._actions.get(SUSPEND_ACTION_ID).available;
     }
 
-    // eslint-disable-next-line camelcase
-    get can_lock_screen() {
+    get canLockScreen() {
         return this._actions.get(LOCK_SCREEN_ACTION_ID).available;
     }
 
-    // eslint-disable-next-line camelcase
-    get can_switch_user() {
+    get canSwitchUser() {
         return this._actions.get(SWITCH_USER_ACTION_ID).available;
     }
 
-    // eslint-disable-next-line camelcase
-    get can_logout() {
+    get canLogout() {
         return this._actions.get(LOGOUT_ACTION_ID).available;
     }
 
-    // eslint-disable-next-line camelcase
-    get can_lock_orientation() {
+    get canLockOrientation() {
         return this._actions.get(LOCK_ORIENTATION_ACTION_ID).available;
     }
 
-    // eslint-disable-next-line camelcase
-    get orientation_lock_icon() {
+    get orientationLockIcon() {
         return this._actions.get(LOCK_ORIENTATION_ACTION_ID).iconName;
     }
 
diff --git a/js/ui/barLevel.js b/js/ui/barLevel.js
index f4fdb6e51..25d483528 100644
--- a/js/ui/barLevel.js
+++ b/js/ui/barLevel.js
@@ -60,13 +60,11 @@ var BarLevel = GObject.registerClass({
         this.queue_repaint();
     }
 
-    // eslint-disable-next-line camelcase
-    get maximum_value() {
+    get maximumValue() {
         return this._maxValue;
     }
 
-    // eslint-disable-next-line camelcase
-    set maximum_value(value) {
+    set maximumValue(value) {
         value = Math.max(value, 1);
 
         if (this._maxValue == value)
@@ -78,13 +76,11 @@ var BarLevel = GObject.registerClass({
         this.queue_repaint();
     }
 
-    // eslint-disable-next-line camelcase
-    get overdrive_start() {
+    get overdriveStart() {
         return this._overdriveStart;
     }
 
-    // eslint-disable-next-line camelcase
-    set overdrive_start(value) {
+    set overdriveStart(value) {
         if (this._overdriveStart == value)
             return;
 
diff --git a/js/ui/dialog.js b/js/ui/dialog.js
index 4af154d6f..3e8bfee7d 100644
--- a/js/ui/dialog.js
+++ b/js/ui/dialog.js
@@ -336,13 +336,11 @@ var ListSectionItem = GObject.registerClass({
         this.add_child(textLayout);
     }
 
-    // eslint-disable-next-line camelcase
-    get icon_actor() {
+    get iconActor() {
         return this._iconActorBin.get_child();
     }
 
-    // eslint-disable-next-line camelcase
-    set icon_actor(actor) {
+    set iconActor(actor) {
         this._iconActorBin.set_child(actor);
         this.notify('icon-actor');
     }
diff --git a/js/ui/iconGrid.js b/js/ui/iconGrid.js
index fde6c702b..e8ac2b07e 100644
--- a/js/ui/iconGrid.js
+++ b/js/ui/iconGrid.js
@@ -1090,8 +1090,7 @@ var IconGridLayout = GObject.registerClass({
         return [null, DragLocation.EMPTY_SPACE];
     }
 
-    // eslint-disable-next-line camelcase
-    get icon_size() {
+    get iconSize() {
         return this._iconSize;
     }
 
diff --git a/js/ui/layout.js b/js/ui/layout.js
index b082ec80b..1a41a34be 100644
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@@ -79,13 +79,11 @@ var MonitorConstraint = GObject.registerClass({
         this.notify('index');
     }
 
-    // eslint-disable-next-line camelcase
-    get work_area() {
+    get workArea() {
         return this._workArea;
     }
 
-    // eslint-disable-next-line camelcase
-    set work_area(v) {
+    set workArea(v) {
         if (v == this._workArea)
             return;
         this._workArea = v;
diff --git a/js/ui/padOsd.js b/js/ui/padOsd.js
index a402fad7e..ed207415a 100644
--- a/js/ui/padOsd.js
+++ b/js/ui/padOsd.js
@@ -322,13 +322,11 @@ var PadDiagram = GObject.registerClass({
         this._initLabels();
     }
 
-    // eslint-disable-next-line camelcase
-    get editor_actor() {
+    get editorActor() {
         return this._editorActor;
     }
 
-    // eslint-disable-next-line camelcase
-    set editor_actor(actor) {
+    set editorActor(actor) {
         actor.hide();
         this._editorActor = actor;
         this.add_actor(actor);
diff --git a/js/ui/windowPreview.js b/js/ui/windowPreview.js
index b17c87be3..fddb62e26 100644
--- a/js/ui/windowPreview.js
+++ b/js/ui/windowPreview.js
@@ -188,8 +188,7 @@ var WindowPreviewLayout = GObject.registerClass({
         return [...this._windows.values()].map(i => i.metaWindow);
     }
 
-    // eslint-disable-next-line camelcase
-    get bounding_box() {
+    get boundingBox() {
         return this._boundingBox;
     }
 });
@@ -631,13 +630,11 @@ var WindowPreview = GObject.registerClass({
         };
     }
 
-    // eslint-disable-next-line camelcase
-    get overlay_enabled() {
+    get overlayEnabled() {
         return this._overlayEnabled;
     }
 
-    // eslint-disable-next-line camelcase
-    set overlay_enabled(enabled) {
+    set overlayEnabled(enabled) {
         if (this._overlayEnabled === enabled)
             return;
 
diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index 951f45219..b3ca4cca5 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -851,13 +851,11 @@ var WorkspaceLayout = GObject.registerClass({
         this.layout_changed();
     }
 
-    // eslint-disable-next-line camelcase
-    get layout_frozen() {
+    get layoutFrozen() {
         return this._layoutFrozen;
     }
 
-    // eslint-disable-next-line camelcase
-    set layout_frozen(f) {
+    set layoutFrozen(f) {
         if (this._layoutFrozen === f)
             return;
 
diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
index f74c8fecb..40a33fe3a 100644
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@@ -334,8 +334,7 @@ var WorkspaceThumbnail = GObject.registerClass({
         }
     }
 
-    // eslint-disable-next-line camelcase
-    set slide_position(slidePosition) {
+    set slidePosition(slidePosition) {
         if (this._slidePosition == slidePosition)
             return;
 
@@ -348,13 +347,11 @@ var WorkspaceThumbnail = GObject.registerClass({
         this.queue_relayout();
     }
 
-    // eslint-disable-next-line camelcase
-    get slide_position() {
+    get slidePosition() {
         return this._slidePosition;
     }
 
-    // eslint-disable-next-line camelcase
-    set collapse_fraction(collapseFraction) {
+    set collapseFraction(collapseFraction) {
         if (this._collapseFraction == collapseFraction)
             return;
         this._collapseFraction = collapseFraction;
@@ -362,8 +359,7 @@ var WorkspaceThumbnail = GObject.registerClass({
         this.queue_relayout();
     }
 
-    // eslint-disable-next-line camelcase
-    get collapse_fraction() {
+    get collapseFraction() {
         return this._collapseFraction;
     }