diff --git a/src/popup/app/tools/views/tools.html b/src/popup/app/tools/tools.component.html
similarity index 100%
rename from src/popup/app/tools/views/tools.html
rename to src/popup/app/tools/tools.component.html
diff --git a/src/popup/app/tools/tools.component.ts b/src/popup/app/tools/tools.component.ts
index db7c0552682..b2c95148bba 100644
--- a/src/popup/app/tools/tools.component.ts
+++ b/src/popup/app/tools/tools.component.ts
@@ -1,5 +1,5 @@
 import UtilsService from '../../../services/utils.service';
-import * as template from './views/tools.html';
+import * as template from './tools.component.html';
 
 class ToolsController {
     showExport: boolean;
diff --git a/src/services/autofill.service.ts b/src/services/autofill.service.ts
index 671e8c32f22..6bec6c1ae17 100644
--- a/src/services/autofill.service.ts
+++ b/src/services/autofill.service.ts
@@ -16,7 +16,6 @@ const IdentityAttributes: string[] = ['autoCompleteType', 'data-stripe', 'htmlNa
 const UsernameFieldNames: string[] = ['username', 'user name', 'email', 'email address', 'e-mail', 'e-mail address',
     'userid', 'user id'];
 
-
 /* tslint:disable */
 const IsoCountries: { [id: string]: string; } = {
     afghanistan: "AF", "aland islands": "AX", albania: "AL", algeria: "DZ", "american samoa": "AS", andorra: "AD",