diff --git a/.eslint_dictionary.js b/.eslint_dictionary.js
index ca66dbccb3..200e688185 100644
--- a/.eslint_dictionary.js
+++ b/.eslint_dictionary.js
@@ -14,6 +14,7 @@ export default [
   'codegen',
   'cognito',
   'ctor',
+  'datastore',
   'debounce',
   'declarator',
   'deployer',
diff --git a/packages/cli/src/commands/generate/graphql-client-code/generate_api_code_adapter.ts b/packages/cli/src/commands/generate/graphql-client-code/generate_api_code_adapter.ts
index 5a7a4a23c5..c241a0a6c1 100644
--- a/packages/cli/src/commands/generate/graphql-client-code/generate_api_code_adapter.ts
+++ b/packages/cli/src/commands/generate/graphql-client-code/generate_api_code_adapter.ts
@@ -10,7 +10,7 @@ import { AwsCredentialIdentityProvider } from '@aws-sdk/types';
 export type InvokeGenerateApiCodeProps = GenerateOptions & BackendIdentifier;
 
 /**
- * Class to wrap static generateApiCode method for testability.
+ * Class to wrap static generateApiCode method to facilitate testing.
  */
 export class GenerateApiCodeAdapter {
   /**
diff --git a/packages/cli/src/commands/generate/graphql-client-code/generate_graphql_client_code_command.ts b/packages/cli/src/commands/generate/graphql-client-code/generate_graphql_client_code_command.ts
index 164bb3ee15..0d10e984c7 100644
--- a/packages/cli/src/commands/generate/graphql-client-code/generate_graphql_client_code_command.ts
+++ b/packages/cli/src/commands/generate/graphql-client-code/generate_graphql_client_code_command.ts
@@ -244,7 +244,7 @@ export class GenerateGraphqlClientCodeCommand
       })
       .option('modelRespectPrimaryKeyAttributesOnConnectionField', {
         description:
-          'If enabled, datastore queries will respect the primary + sort key fields, rather than a defaut id field',
+          'If enabled, Datastore queries will respect the primary + sort key fields, rather than a default id field',
         type: 'boolean',
         array: false,
         hidden: true,