diff --git a/src/commands/get.command.ts b/src/commands/get.command.ts
index f4ae99943d..4e1384d154 100644
--- a/src/commands/get.command.ts
+++ b/src/commands/get.command.ts
@@ -298,22 +298,22 @@ export class GetCommand {
             case 'item':
                 template = Cipher.template();
                 break;
-            case 'field':
+            case 'item.field':
                 template = Field.template();
                 break;
-            case 'login':
+            case 'item.login':
                 template = Login.template();
                 break;
-            case 'loginuri':
+            case 'item.login.uri':
                 template = LoginUri.template();
                 break;
-            case 'card':
+            case 'item.card':
                 template = Card.template();
                 break;
-            case 'identity':
+            case 'item.identity':
                 template = Identity.template();
                 break;
-            case 'securenote':
+            case 'item.securenote':
                 template = SecureNote.template();
                 break;
             case 'folder':
diff --git a/src/commands/login.command.ts b/src/commands/login.command.ts
index 075e8d6d87..cf789102c2 100644
--- a/src/commands/login.command.ts
+++ b/src/commands/login.command.ts
@@ -115,7 +115,7 @@ export class LoginCommand {
                 '$ export BW_SESSION="' + process.env.BW_SESSION + '"\n' +
                 '> $env:BW_SESSION="' + process.env.BW_SESSION + '"\n\n' +
                 'You can also pass the session key to any command with the `--session` option. ex:\n' +
-                '$ bw get items --session ' + process.env.BW_SESSION);
+                '$ bw list items --session ' + process.env.BW_SESSION);
             res.raw = process.env.BW_SESSION;
             return Response.success(res);
         } catch (e) {
diff --git a/src/commands/unlock.command.ts b/src/commands/unlock.command.ts
index 74d980eb03..83047658bd 100644
--- a/src/commands/unlock.command.ts
+++ b/src/commands/unlock.command.ts
@@ -37,7 +37,7 @@ export class UnlockCommand {
                 '$ export BW_SESSION="' + process.env.BW_SESSION + '"\n' +
                 '> $env:BW_SESSION="' + process.env.BW_SESSION + '"\n\n' +
                 'You can also pass the session key to any command with the `--session` option. ex:\n' +
-                '$ bw get items --session ' + process.env.BW_SESSION);
+                '$ bw list items --session ' + process.env.BW_SESSION);
             res.raw = process.env.BW_SESSION;
             return Response.success(res);
         } else {