From 3df5a9454ebb90710fe557539e472af450c37e6b Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Sat, 21 Jan 2017 02:08:14 -0500
Subject: [PATCH] 1password importer naming adjustments

---
 src/app/services/importService.js      | 12 ++++++------
 src/app/tools/toolsImportController.js |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/app/services/importService.js b/src/app/services/importService.js
index 8db7941819..fe51023ffb 100644
--- a/src/app/services/importService.js
+++ b/src/app/services/importService.js
@@ -29,11 +29,11 @@
                 case 'padlockcsv':
                     importPadlockCsv(file, success, error);
                     break;
-                case '1password41pif':
-                    import1Password41Pif(file, success, error);
+                case '1password1pif':
+                    import1Password1Pif(file, success, error);
                     break;
-                case '1password6csv':
-                    import1Password6Csv(file, success, error);
+                case '1password6wincsv':
+                    import1Password6WinCsv(file, success, error);
                     break;
                 case 'chromecsv':
                     importChromeCsv(file, success, error);
@@ -709,7 +709,7 @@
             });
         }
 
-        function import1Password41Pif(file, success, error) {
+        function import1Password1Pif(file, success, error) {
             var folders = [],
                 logins = [],
                 loginRelationships = [],
@@ -794,7 +794,7 @@
             };
         }
 
-        function import1Password6Csv(file, success, error) {
+        function import1Password6WinCsv(file, success, error) {
             var folders = [],
                 logins = [],
                 loginRelationships = [];
diff --git a/src/app/tools/toolsImportController.js b/src/app/tools/toolsImportController.js
index 624d63c254..09073076fa 100644
--- a/src/app/tools/toolsImportController.js
+++ b/src/app/tools/toolsImportController.js
@@ -56,15 +56,15 @@
                     '"Unsecured archive (readable) in CSV format" and save the CSV file.')
             },
             {
-                id: '1password41pif',
-                name: '1Password 4 (1pif)',
+                id: '1password1pif',
+                name: '1Password (1pif)',
                 instructions: $sce.trustAsHtml('See detailed instructions on our help site at ' +
                     '<a target="_blank" href="https://help.bitwarden.com/getting-started/import-from-1password/">' +
                     'https://help.bitwarden.com/getting-started/import-from-1password/</a>')
             },
             {
-                id: '1password6csv',
-                name: '1Password 6 (csv)',
+                id: '1password6wincsv',
+                name: '1Password 6 Windows (csv)',
                 instructions: $sce.trustAsHtml('See detailed instructions on our help site at ' +
                     '<a target="_blank" href="https://help.bitwarden.com/getting-started/import-from-1password/">' +
                     'https://help.bitwarden.com/getting-started/import-from-1password/</a>')