diff --git a/defaults/main.yml b/defaults/main.yml
index f4a1a08..e9d45fc 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -4,11 +4,11 @@
 edge_sso_installation_config_file: "{{ opdk_installer_path }}/{{ edge_sso_installation_config_filename }}"
 
 jwt_folder: "{{ apigee_home }}/customer/application/apigee-sso/jwt-keys"
-jwt_private_key: private_key.pem
-sso_jwt_signinig_key_filepath: "{{ jwt_folder }}/{{ jwt_private_key }}"
-jwt_public_key: public_key.pem
-sso_jwt_verification_key_filepath: "{{ jwt_folder }}/{{ jwt_public_key }}"
-jwt_key_size: 2048
+sso_jwt_signinig_key_file_name: private_key.pem
+sso_jwt_signinig_key_file_path: "{{ jwt_folder }}/{{ sso_jwt_signinig_key_file_name }}"
+sso_jwt_signinig_key_size: 2048
+sso_jwt_verification_key_file_name: public_key.pem
+sso_jwt_verification_key_file_path: "{{ jwt_folder }}/{{ sso_jwt_verification_key_file_name }}"
 
 saml_folder: "{{ apigee_home }}/customer/application/apigee-sso/saml"
 sso_saml_service_provider_key_file_name: server.key
diff --git a/tasks/create-jwt-keys.yml b/tasks/create-jwt-keys.yml
index 927c3cf..91b9d92 100644
--- a/tasks/create-jwt-keys.yml
+++ b/tasks/create-jwt-keys.yml
@@ -1,7 +1,7 @@
 ---
 - name: Assert whether Private
   stat:
-    path: "{{ jwt_private_key }}"
+    path: "{{ sso_jwt_signinig_key_file_path }}"
   register: key
 
 - block:
@@ -19,29 +19,28 @@
     register: passphrase
 
   - name: Generate your private key with a passphrase
-    shell: "openssl genrsa -passout pass:{{ passphrase.stdout }} -out {{ jwt_private_key }} {{ jwt_key_size }}"
+    shell: "openssl genrsa -passout pass:{{ passphrase.stdout }} -out {{ sso_jwt_signinig_key_file_name }} {{ sso_jwt_signinig_key_size }}"
     args:
       chdir: "{{ jwt_folder }}"
-      creates: "{{ jwt_private_key }}"
 
   - name: Prep to remove passphrase from Key
     copy:
-      dest: "{{ jwt_folder }}/remove-passphrase-{{ jwt_private_key }}"
-      src: "{{ jwt_folder }}/{{ jwt_private_key }}"
+      dest: "{{ jwt_folder }}/remove-passphrase-{{ sso_jwt_signinig_key_file_name }}"
+      src: "{{ jwt_folder }}/{{ sso_jwt_signinig_key_file_name }}"
       remote_src: yes
 
   - name: Remove the passphrase from the key
-    shell: "openssl rsa -in remove-passphrase-{{ jwt_private_key }} -passin pass:{{ passphrase.stdout }} -out {{ jwt_private_key }}"
+    shell: "openssl rsa -in remove-passphrase-{{ sso_jwt_signinig_key_file_name }} -passin pass:{{ passphrase.stdout }} -out {{ sso_jwt_signinig_key_file_name }}"
     args:
       chdir: "{{ jwt_folder }}"
 
   - name: Clean up passphrase removal file
     file:
-      path: "{{ jwt_folder }}/remove-passphrase-{{ jwt_private_key }}"
+      path: "{{ jwt_folder }}/remove-passphrase-{{ sso_jwt_signinig_key_file_name }}"
       state: absent
 
   - name: Generate Verification Key
-    shell: "openssl rsa -pubout -in {{ jwt_private_key }} -out {{ jwt_public_key }}"
+    shell: "openssl rsa -pubout -in {{ sso_jwt_signinig_key_file_name }} -out {{ sso_jwt_verification_key_file_name }}"
     args:
       chdir: "{{ jwt_folder }}"
 
diff --git a/tasks/main.yml b/tasks/main.yml
index ff1063f..237a0ad 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -12,7 +12,7 @@
     key: "{{ item.key }}"
     value: "{{ item.value }}"
   with_items:
-  - { key: 'sso_jwt_signinig_key_filepath', value: '{{ sso_jwt_signinig_key_filepath }}' }
+  - { key: 'sso_jwt_signinig_key_file_path', value: '{{ sso_jwt_signinig_key_file_path }}' }
   - { key: 'sso_saml_service_provider_key', value: '{{ sso_saml_service_provider_key }}' }
   - { key: 'sso_saml_service_provider_certificate', value: '{{ sso_saml_service_provider_certificate_file_path}}' }
   - { key: 'edge_sso_installation_config_filename' , value: '{{ edge_sso_installation_config_filename }}' }