diff --git a/server/graphql-schema.js b/server/graphql-schema.js
index f18b71093..fc393a2eb 100644
--- a/server/graphql-schema.js
+++ b/server/graphql-schema.js
@@ -493,11 +493,13 @@ const graphqlSchema = gql`
         """
         text: String!
         """
-        The AT mode this command may be getting ran in, such as "quickNavOn".
+        The AT mode this command may be getting ran in, such as quickNavOn,
+        browseMode, etc.
         The same command can be ran during the same test, but in a different
-        mode
+        mode.
         """
-        settings: String
+        # TODO: Add link to list of known AT modes
+        atOperatingMode: String
     }
 
     """
diff --git a/server/resolvers/TestPlanRunOperations/createTestResultSkeleton.js b/server/resolvers/TestPlanRunOperations/createTestResultSkeleton.js
index ace1363a0..a4a515958 100644
--- a/server/resolvers/TestPlanRunOperations/createTestResultSkeleton.js
+++ b/server/resolvers/TestPlanRunOperations/createTestResultSkeleton.js
@@ -38,7 +38,7 @@ const createTestResultSkeleton = ({
                                     scenario.commands.find(
                                         c =>
                                             c.id === e.commandId &&
-                                            c.settings === e.settings
+                                            c.atOperatingMode === e.settings
                                     ) && e.priority === 'EXCLUDE'
                             );
                         })
diff --git a/server/resolvers/TestPlanVersion/testsResolver.js b/server/resolvers/TestPlanVersion/testsResolver.js
index 9b64df739..5a4e6df36 100644
--- a/server/resolvers/TestPlanVersion/testsResolver.js
+++ b/server/resolvers/TestPlanVersion/testsResolver.js
@@ -42,7 +42,7 @@ const testsResolver = parentRecord => {
                                 text: `${commandKVs[0].value}${
                                     screenText ? ` (${screenText})` : ''
                                 }`,
-                                settings: scenario.settings
+                                atOperatingMode: scenario.settings
                             };
                         }
                         return { id: '', text: '' };
diff --git a/server/tests/integration/graphql.test.js b/server/tests/integration/graphql.test.js
index 81df207b7..77466de3c 100644
--- a/server/tests/integration/graphql.test.js
+++ b/server/tests/integration/graphql.test.js
@@ -153,7 +153,7 @@ describe('graphql', () => {
             ['TestPlanVersion', 'recommendedPhaseTargetDate'],
             ['TestPlanVersion', 'deprecatedAt'],
             ['Test', 'viewers'],
-            ['Command', 'settings'] // TODO: Uncomment when v2 test format CI tests are done
+            ['Command', 'atOperatingMode'] // TODO: Include when v2 test format CI tests are done
         ];
         ({
             typeAwareQuery,
@@ -279,7 +279,7 @@ describe('graphql', () => {
                                         __typename
                                         id
                                         text
-                                        settings
+                                        atOperatingMode
                                     }
                                 }
                                 assertions {
@@ -530,7 +530,6 @@ describe('graphql', () => {
                 }
             `
         );
-        // console.info(queryResult);
 
         await dbCleaner(async () => {
             const {