diff --git a/.eslintrc.js b/.eslintrc.js
index cc478bc5..20c84b9e 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -74,6 +74,9 @@ module.exports = {
       { "selector": "memberLike", "modifiers": ["private"], "format": ["camelCase"], "leadingUnderscore": "require" },
       { "selector": "memberLike", "modifiers": ["protected"], "format": ["camelCase"], "leadingUnderscore": "require" },
       { "selector": "enumMember", "format": ["UPPER_CASE"] },
+      // memberLike - Allow enum-like objects to use UPPER_CASE
+      { "selector": "property", "modifiers": ["public"], "format": ["camelCase", "UPPER_CASE"] },
+      { "selector": "method", "modifiers": ["public"], "format": ["camelCase", "UPPER_CASE"] },
       // typeLike
       { "selector": "typeLike", "format": ["PascalCase"] },
       { "selector": "interface", "format": ["PascalCase"], "prefix": ["I"] },
diff --git a/src/common/services/CoreMouseService.ts b/src/common/services/CoreMouseService.ts
index b1d136e0..c0ed3c6a 100644
--- a/src/common/services/CoreMouseService.ts
+++ b/src/common/services/CoreMouseService.ts
@@ -6,9 +6,6 @@ import { IBufferService, ICoreService, ICoreMouseService } from 'common/services
 import { EventEmitter, IEvent } from 'common/EventEmitter';
 import { ICoreMouseProtocol, ICoreMouseEvent, CoreMouseEncoding, CoreMouseEventType, CoreMouseButton, CoreMouseAction } from 'common/Types';
 
-// Disable naming convention as this file uses non-standard naming and it might be dangerous to change it
-/* eslint-disable @typescript-eslint/naming-convention */
-
 /**
  * Supported default protocols.
  */