diff --git a/group_vars/all b/group_vars/all
index aaefe5052..bae2f7b5e 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -105,7 +105,7 @@ dummy:
 ## Monitor options
 #
 #monitor_interface: interface
-#monitor_secret: "{{ ceph_mon_key.stdout }}"
+#monitor_secret: "{{ monitor_keyring.stdout }}"
 #mon_osd_down_out_interval: 600
 #mon_osd_min_down_reporters: 7 # number of OSDs per host + 1
 #mon_clock_drift_allowed: .15
diff --git a/group_vars/mons b/group_vars/mons
index 189242df7..44b0b4d79 100644
--- a/group_vars/mons
+++ b/group_vars/mons
@@ -11,7 +11,7 @@ dummy:
 
 # ACTIVATE BOTH FSID AND MONITOR_SECRET VARIABLES FOR NON-VAGRANT DEPLOYMENT
 #fsid: "{{ cluster_uuid.stdout }}"
-#monitor_secret: "{{ ceph_mon_key.stdout }}"
+#monitor_secret: "{{ monitor_keyring.stdout }}"
 #cephx: true
 
 # CephFS
diff --git a/roles/ceph-mon/defaults/main.yml b/roles/ceph-mon/defaults/main.yml
index 8d3279b98..da2298a51 100644
--- a/roles/ceph-mon/defaults/main.yml
+++ b/roles/ceph-mon/defaults/main.yml
@@ -9,7 +9,7 @@ rgw_group_name: rgws
 
 # ACTIVATE BOTH FSID AND MONITOR_SECRET VARIABLES FOR NON-VAGRANT DEPLOYMENT
 fsid: "{{ cluster_uuid.stdout }}"
-monitor_secret: "{{ ceph_mon_key.stdout }}"
+monitor_secret: "{{ monitor_keyring.stdout }}"
 cephx: true
 
 # CephFS
diff --git a/roles/ceph-mon/tasks/deploy_monitors.yml b/roles/ceph-mon/tasks/deploy_monitors.yml
index 8aaac6619..d0e666501 100644
--- a/roles/ceph-mon/tasks/deploy_monitors.yml
+++ b/roles/ceph-mon/tasks/deploy_monitors.yml
@@ -1,17 +1,17 @@
 ---
 - name: generate monitor initial keyring
   local_action: >
-    shell python -c "import os ; import struct ; import time; import base64 ; key = os.urandom(16) ; header = struct.pack('<hiih',1,int(time.time()),0,len(key)) ; print base64.b64encode(header + key)' > fetch/ceph_mon_key.con"
-    creates=fetch/ceph_mon_key.conf
-  register: ceph_mon_key
+    shell python -c "import os ; import struct ; import time; import base64 ; key = os.urandom(16) ; header = struct.pack('<hiih',1,int(time.time()),0,len(key)) ; print base64.b64encode(header + key)' > fetch/monitor_keyring.conf"
+    creates=fetch/monitor_keyring.conf
+  register: monitor_keyring
   sudo: false
 
 - name: read monitor initial keyring if it already exists
   local_action: >
-    command cat fetch/ceph_mon_key.conf
-    removes=fetch/ceph_mon_key.conf
+    command cat fetch/monitor_keyring.conf
+    removes=fetch/monitor_keyring.conf
   changed_when: false
-  register: ceph_mon_key
+  register: monitor_keyring
   sudo: false
 
 - name: create monitor initial keyring
diff --git a/roles/ceph-restapi/tasks/start_restapi.yml b/roles/ceph-restapi/tasks/start_restapi.yml
index cbe47351e..6a62c19f2 100644
--- a/roles/ceph-restapi/tasks/start_restapi.yml
+++ b/roles/ceph-restapi/tasks/start_restapi.yml
@@ -1,6 +1,7 @@
 ---
 - name: check if Ceph REST API is already started
   shell: "pgrep ceph-rest-api"
+  changed_when: false
   ignore_errors: true
   register: restapi_status