diff --git a/chrome/content/zotero/components/tag-selector.jsx b/chrome/content/zotero/components/tagSelector.jsx
similarity index 97%
rename from chrome/content/zotero/components/tag-selector.jsx
rename to chrome/content/zotero/components/tagSelector.jsx
index 55287e3c34..85dc0aa04a 100644
--- a/chrome/content/zotero/components/tag-selector.jsx
+++ b/chrome/content/zotero/components/tagSelector.jsx
@@ -2,7 +2,7 @@
 
 const React = require('react');
 const PropTypes = require('prop-types');
-const TagList = require('./tag-selector/tag-list');
+const TagList = require('./tagSelector/tagSelectorList');
 const { Button } = require('./button');
 const { IconTagSelectorMenu } = require('./icons');
 const Search = require('./search');
diff --git a/chrome/content/zotero/components/tag-selector/tag-list.jsx b/chrome/content/zotero/components/tagSelector/tagSelectorList.jsx
similarity index 100%
rename from chrome/content/zotero/components/tag-selector/tag-list.jsx
rename to chrome/content/zotero/components/tagSelector/tagSelectorList.jsx
diff --git a/chrome/content/zotero/containers/containers.xul b/chrome/content/zotero/containers/containers.xul
index 56163751ae..91cfbd4f07 100644
--- a/chrome/content/zotero/containers/containers.xul
+++ b/chrome/content/zotero/containers/containers.xul
@@ -29,5 +29,5 @@
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 	<script src="chrome://zotero/content/include.js"></script>
 	
-	<script src="tagSelector.js"></script>
+	<script src="tagSelectorContainer.js"></script>
 </overlay>
\ No newline at end of file
diff --git a/chrome/content/zotero/containers/tagSelector.jsx b/chrome/content/zotero/containers/tagSelectorContainer.jsx
similarity index 99%
rename from chrome/content/zotero/containers/tagSelector.jsx
rename to chrome/content/zotero/containers/tagSelectorContainer.jsx
index 48f813a2f6..8928d38b96 100644
--- a/chrome/content/zotero/containers/tagSelector.jsx
+++ b/chrome/content/zotero/containers/tagSelectorContainer.jsx
@@ -7,7 +7,7 @@ const React = require('react');
 const ReactDOM = require('react-dom');
 const PropTypes = require('prop-types');
 const { IntlProvider } = require('react-intl');
-const TagSelector = require('components/tag-selector.js');
+const TagSelector = require('components/tagSelector.js');
 const defaults = {
 	tagColors: new Map(),
 	tags: [],
diff --git a/scss/_zotero-react-client.scss b/scss/_zotero-react-client.scss
index 2664659a91..fa6e91d2c7 100644
--- a/scss/_zotero-react-client.scss
+++ b/scss/_zotero-react-client.scss
@@ -23,4 +23,4 @@
 @import "components/button";
 @import "components/icons";
 @import "components/search";
-@import "components/tag-selector";
+@import "components/tagSelector";
diff --git a/scss/components/_tag-selector.scss b/scss/components/_tagSelector.scss
similarity index 96%
rename from scss/components/_tag-selector.scss
rename to scss/components/_tagSelector.scss
index 1b4c844d2c..1a7b7dfb40 100644
--- a/scss/components/_tag-selector.scss
+++ b/scss/components/_tagSelector.scss
@@ -74,7 +74,7 @@
 	overflow: hidden;
 	text-overflow: ellipsis;
 	white-space: pre;
-	padding: 1px 4px 3px; // See also tag-list.jsx
+	padding: 1px 4px 3px; // See also TagSelectorList.jsx
 
 	&.colored {
 		font-weight: bold;