diff --git a/lib/DocumentFilter/DocumentFilterField.js b/lib/DocumentFilter/DocumentFilterField.js
index dd86eb00..cc3793a1 100644
--- a/lib/DocumentFilter/DocumentFilterField.js
+++ b/lib/DocumentFilter/DocumentFilterField.js
@@ -76,7 +76,7 @@ const DocumentFilterField = ({ atTypeValues, index, name }) => {
 
 DocumentFilterField.propTypes = {
   atTypeValues: PropTypes.arrayOf(PropTypes.object),
-  index: PropTypes.string,
+  index: PropTypes.number,
   name: PropTypes.string,
 };
 
diff --git a/lib/DocumentFilter/DocumentFilterRule.js b/lib/DocumentFilter/DocumentFilterRule.js
index 8daf11b9..5b4c2071 100644
--- a/lib/DocumentFilter/DocumentFilterRule.js
+++ b/lib/DocumentFilter/DocumentFilterRule.js
@@ -97,7 +97,6 @@ const DocumentFilterRule = ({
 
 DocumentFilterRule.propTypes = {
   ariaLabelledby: PropTypes.string.isRequired,
-  clearRuleValue: PropTypes.func.isRequired,
   index: PropTypes.number.isRequired,
   name: PropTypes.string.isRequired,
   onDelete: PropTypes.func.isRequired,
diff --git a/lib/DocumentFilter/SupplementaryDocumentFilter.js b/lib/DocumentFilter/SupplementaryDocumentFilter.js
index 801afa13..1b5cb8ef 100644
--- a/lib/DocumentFilter/SupplementaryDocumentFilter.js
+++ b/lib/DocumentFilter/SupplementaryDocumentFilter.js
@@ -14,7 +14,7 @@ import {
 
 import DocumentFilterForm from './DocumentFilterForm';
 
-const DocumentFilter = ({ activeFilters, atTypeValues, filterHandlers }) => {
+const SupplementaryDocumentFilter = ({ activeFilters, atTypeValues, filterHandlers }) => {
   const [editingFilters, setEditingFilters] = useState(false);
   const openEditModal = () => setEditingFilters(true);
   const closeEditModal = () => setEditingFilters(false);
@@ -124,10 +124,10 @@ const DocumentFilter = ({ activeFilters, atTypeValues, filterHandlers }) => {
   );
 };
 
-DocumentFilter.propTypes = {
+SupplementaryDocumentFilter.propTypes = {
   activeFilters: PropTypes.object,
   atTypeValues: PropTypes.arrayOf(PropTypes.object),
   filterHandlers: PropTypes.object,
 };
 
-export default DocumentFilter;
+export default SupplementaryDocumentFilter;
diff --git a/lib/DocumentFilter/SupplementaryDocumentFilterRule.js b/lib/DocumentFilter/SupplementaryDocumentFilterRule.js
index 8a20d2b8..caa2d4a6 100644
--- a/lib/DocumentFilter/SupplementaryDocumentFilterRule.js
+++ b/lib/DocumentFilter/SupplementaryDocumentFilterRule.js
@@ -15,7 +15,7 @@ import { Field } from 'react-final-form';
 import { required as requiredValidator } from '../validators';
 import DocumentFilterRuleConstants from './DocumentFilterRuleConstants';
 
-const DocumentFilterRule = ({
+const SupplementaryDocumentFilterRule = ({
   ariaLabelledby,
   atTypeValues,
   index,
@@ -128,10 +128,9 @@ const DocumentFilterRule = ({
   );
 };
 
-DocumentFilterRule.propTypes = {
+SupplementaryDocumentFilterRule.propTypes = {
   ariaLabelledby: PropTypes.string.isRequired,
-  atTypeValues: PropTypes.object.isRequired,
-  clearRuleValue: PropTypes.func.isRequired,
+  atTypeValues: PropTypes.arrayOf(PropTypes.object),
   index: PropTypes.number.isRequired,
   name: PropTypes.string.isRequired,
   onDelete: PropTypes.func.isRequired,
@@ -142,4 +141,4 @@ DocumentFilterRule.propTypes = {
   }),
 };
 
-export default DocumentFilterRule;
+export default SupplementaryDocumentFilterRule;