diff --git a/pyquarantine/notifications.py b/pyquarantine/notify.py
similarity index 100%
rename from pyquarantine/notifications.py
rename to pyquarantine/notify.py
diff --git a/pyquarantine/storages.py b/pyquarantine/storage.py
similarity index 100%
rename from pyquarantine/storages.py
rename to pyquarantine/storage.py
diff --git a/pyquarantine/whitelists.py b/pyquarantine/whitelist.py
similarity index 100%
rename from pyquarantine/whitelists.py
rename to pyquarantine/whitelist.py
diff --git a/test-pyquarantine b/test-pyquarantine
deleted file mode 100755
index ecece9b..0000000
--- a/test-pyquarantine
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-import pyquarantine.cli
-
-if __name__ == '__main__':
-    sys.exit(
-        pyquarantine.cli.main()
-    )
diff --git a/test-pyquarantine-milter b/test-pyquarantine-milter
deleted file mode 100755
index 3ab34c7..0000000
--- a/test-pyquarantine-milter
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-import pyquarantine.run
-
-if __name__ == '__main__':
-    sys.exit(
-        pyquarantine.run.main()
-    )