diff --git a/tasks/create-verification-and-signing-key.yml b/tasks/create-jwt-keys.yml
similarity index 100%
rename from tasks/create-verification-and-signing-key.yml
rename to tasks/create-jwt-keys.yml
diff --git a/tasks/create-private-key-and-self-signed-cert.yml b/tasks/create-saml-keys-cert.yml
similarity index 100%
rename from tasks/create-private-key-and-self-signed-cert.yml
rename to tasks/create-saml-keys-cert.yml
diff --git a/tasks/main.yml b/tasks/main.yml
index bf8a079..267c4a2 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -9,11 +9,11 @@
 
 - name: Create Private key and Self Signed Certificate Request
   tags: ['private']
-  include_tasks: create-private-key-and-self-signed-cert.yml
+  include_tasks: create-saml-keys-cert.yml
 
 - name: Create Verification and Signing Key
   tags: ['verify']
-  include_tasks: create-verification-and-signing-key.yml
+  include_tasks: create-jwt-keys.yml
 
 - name: Update cache with key and value
   cache: