diff --git a/README.md b/README.md
index 6d70918..1f2d970 100644
--- a/README.md
+++ b/README.md
@@ -39,9 +39,9 @@ See Docker guides for [images](https://docs.docker.com/engine/reference/commandl
 
 | Name              | Default Value       | Description          |
 |-------------------|---------------------|----------------------|
-| `operations_image_filters` | `['dangling=true']` | List of image filters. |
-| `operations_volume_filters` | `['dangling=true']` | List of volume filters. |
-| `operations_container_filters` | `['status=exited', 'status=dead']` | List of container filters. |
+| `operations_image_filter` | `['dangling=true']` | List of image filters. |
+| `operations_volume_filter` | `['dangling=true']` | List of volume filters. |
+| `operations_container_filter` | `['status=exited', 'status=dead']` | List of container filters. |
 
 **Variables for fetching logs**
 
diff --git a/defaults/main.yml b/defaults/main.yml
index 814c5e0..e831889 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,9 +1,9 @@
 # Cleanup Docker
-operations_image_filters:
+operations_image_filter:
   - dangling=true
-operations_volume_filters:
+operations_volume_filter:
   - dangling=true
-operations_container_filters:
+operations_container_filter:
   - status=exited
   - status=dead
 
diff --git a/library/service_map_facts.py b/library/service_map_facts.py
index de2a02c..e790aef 100644
--- a/library/service_map_facts.py
+++ b/library/service_map_facts.py
@@ -57,8 +57,8 @@ def get_systemd_services(module, service_unit_list):
 
 def run_module():
 
-    module_args = dict(operations_service_map=dict(type=dict, required=True),
-                       operations_service_names=dict(type=list, required=True),
+    module_args = dict(service_map=dict(type=dict, required=True),
+                       services=dict(type=list, required=True),
                        )
 
     module = AnsibleModule(