diff --git a/eslint.config.cjs b/eslint.config.cjs
index 0694f4094..a1e9fb120 100644
--- a/eslint.config.cjs
+++ b/eslint.config.cjs
@@ -44,11 +44,6 @@ module.exports = [
       "no-unused-vars": "off",
       "no-use-before-define": "off",
       "no-useless-constructor": "off",
-      "@typescript-eslint/lines-between-class-members": [
-        "error",
-        "always",
-        { exceptAfterSingleLine: true },
-      ],
       "@typescript-eslint/naming-convention": [
         "error",
         { selector: "typeLike", format: ["PascalCase"] },
@@ -79,7 +74,7 @@ module.exports = [
       ],
       "import-x/no-unresolved": "off",
       "import-x/prefer-default-export": "off",
-      "lines-between-class-members": "off",
+      "lines-between-class-members": ["error", "always", { exceptAfterSingleLine: true }],
       "max-len": [
         "error",
         {
diff --git a/repo-tools/definition-checker/check.ts b/repo-tools/definition-checker/check.ts
index 64ffaf2f8..c6bb04fc7 100644
--- a/repo-tools/definition-checker/check.ts
+++ b/repo-tools/definition-checker/check.ts
@@ -1,6 +1,6 @@
 import fs from "fs";
 import path from "path";
-// trunk-ignore(eslint/import/no-extraneous-dependencies)
+// trunk-ignore(eslint/import-x/no-extraneous-dependencies)
 import YAML from "yaml";
 
 // Avoid strictly typing composite config
diff --git a/tests/driver/lint_driver.ts b/tests/driver/lint_driver.ts
index 6fd118492..fce56c2c5 100644
--- a/tests/driver/lint_driver.ts
+++ b/tests/driver/lint_driver.ts
@@ -126,7 +126,7 @@ lint:
         (this.getFullTrunkConfig().lint.definitions.find(
           ({ name }: { name: string }) => name === this.linter,
         )?.known_good_version as string) ?? "";
-      // trunk-ignore(eslint/@typescript-eslint/no-useless-template-literals): Convert kgv to string
+      // trunk-ignore(eslint/@typescript-eslint/no-unnecessary-template-expression): Convert kgv to string
       if (this.linter === "include-what-you-use" && `${kgv}`.length === 3) {
         // TODO(Tyler): `trunk config print` does not correctly wrap quotes around kgv, so we must patch iwyu here
         return `${kgv}0`;
@@ -149,7 +149,7 @@ lint:
 
     let newTrunkContents = "<undefined contents>";
     try {
-      // trunk-ignore(eslint/@typescript-eslint/no-useless-template-literals): Cast to string to handle decimal case
+      // trunk-ignore(eslint/@typescript-eslint/no-unnecessary-template-expression): Cast to string to handle decimal case
       const version = `${this.extractLinterVersion()}`;
       const versionString = version.length > 0 ? `@${version}` : "";
       const linterVersionString = `${this.linter}${versionString}`;
diff --git a/tests/driver/tool_driver.ts b/tests/driver/tool_driver.ts
index ff578b068..0090360b9 100644
--- a/tests/driver/tool_driver.ts
+++ b/tests/driver/tool_driver.ts
@@ -84,7 +84,7 @@ lint:
       return;
     }
     try {
-      // trunk-ignore(eslint/@typescript-eslint/no-useless-template-literals): Cast to string to handle decimal case
+      // trunk-ignore(eslint/@typescript-eslint/no-unnecessary-template-expression): Cast to string to handle decimal case
       const version = `${this.extractToolVersion()}`;
       const versionString = version.length > 0 ? `@${version}` : "";
       const toolVersionString = `${this.tool}${versionString}`;