diff --git a/README.md b/README.md
index ce8a69c..900c219 100644
--- a/README.md
+++ b/README.md
@@ -49,8 +49,8 @@ Additional CLI options that must be appended to the minio server start command.
 
 Minio access and secret keys.
 
-    skip_server: False
-    skip_client: False
+    minio_install_server: false
+    minio_install_client: false
 
 Switches to disable minio server and/or minio client installation.
 
diff --git a/defaults/main.yml b/defaults/main.yml
index a458c1a..9dfda1a 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -25,6 +25,6 @@ minio_server_opts: ""
 minio_access_key: ""
 minio_secret_key: ""
 
-# Switches to disable minio server and/or minio client installation
-skip_server: false
-skip_client: false
+# Switches to enable/disable the minio server and/or minio client installation.
+minio_install_server: true
+minio_install_client: true
diff --git a/tasks/main.yml b/tasks/main.yml
index 492c205..78a39f7 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -28,7 +28,7 @@
     shell: /bin/bash
 
 - include: server.yml
-  when: not skip_server
+  when: minio_install_server
 
 - include: client.yml
-  when: not skip_client
+  when: minio_install_client