diff --git a/doc/appendix-faq.sgml b/doc/appendix-faq.sgml
index 4a5536dc..480c8707 100644
--- a/doc/appendix-faq.sgml
+++ b/doc/appendix-faq.sgml
@@ -205,7 +205,7 @@
    </para>
    <para>
     Note that after registering a delayed standby, <application>repmgrd</application> will only start
-    once the metadata added in the master node has been replicated.
+    once the metadata added in the primary node has been replicated.
    </para>
   </sect2>
 
@@ -218,7 +218,7 @@
   </sect2>
 
   <sect2 id="faq-repmgrd-recloned-no-start" xreflabel="repmgrd not restarting after node cloned">
-   <title>I've recloned a failed master as a standby, but <application>repmgrd</application> refuses to start?</title>
+   <title>I've recloned a failed primary as a standby, but <application>repmgrd</application> refuses to start?</title>
    <para>
     Check you registered the standby after recloning. If unregistered, the standby
     cannot be considered as a promotion candidate even if <varname>failover</varname> is set to
diff --git a/doc/repmgr-standby-unregister.sgml b/doc/repmgr-standby-unregister.sgml
index 7fd6e2f9..b3576946 100644
--- a/doc/repmgr-standby-unregister.sgml
+++ b/doc/repmgr-standby-unregister.sgml
@@ -19,7 +19,7 @@
    If the standby is not running, the command can be executed on another
    node by providing the id of the node to be unregistered using
    the command line parameter <literal>--node-id</literal>, e.g. executing the following
-   command on the master server will unregister the standby with
+   command on the primary server will unregister the standby with
    id <literal>3</literal>:
    <programlisting>
     repmgr standby unregister -f /etc/repmgr.conf --node-id=3
diff --git a/repmgr-action-bdr.c b/repmgr-action-bdr.c
index 02a5c3cc..54af880c 100644
--- a/repmgr-action-bdr.c
+++ b/repmgr-action-bdr.c
@@ -28,7 +28,7 @@
 /*
  * do_bdr_register()
  *
- * As each BDR node is its own master, registering a BDR node
+ * As each BDR node is its own primary, registering a BDR node
  * will create the repmgr metadata schema if necessary.
  */
 void
diff --git a/repmgr-action-cluster.c b/repmgr-action-cluster.c
index f2213455..107d5363 100644
--- a/repmgr-action-cluster.c
+++ b/repmgr-action-cluster.c
@@ -1323,7 +1323,7 @@ do_cluster_cleanup(void)
 
 	conn = establish_db_connection(config_file_options.conninfo, true);
 
-	/* check if there is a master in this cluster */
+	/* check if there is a primary in this cluster */
 	log_info(_("connecting to primary server"));
 	primary_conn = establish_primary_db_connection(conn, true);
 
diff --git a/repmgr-client.c b/repmgr-client.c
index b2292153..ab5a99e3 100644
--- a/repmgr-client.c
+++ b/repmgr-client.c
@@ -925,7 +925,7 @@ main(int argc, char **argv)
 				runtime_options.terse,
 				&config_file_options,
 				argv[0]);
-
+	exit(SUCCESS);
 	check_cli_parameters(action);
 
 	/*
diff --git a/repmgr.conf.sample b/repmgr.conf.sample
index a9b0b484..32e25ce8 100644
--- a/repmgr.conf.sample
+++ b/repmgr.conf.sample
@@ -111,7 +111,7 @@
 # By default, all notifications will be passed; the notification types
 # can be filtered to explicitly named ones, e.g.:
 #
-#   event_notifications=master_register,standby_register
+#   event_notifications=primary_register,standby_register
 
 #event_notification_command=''          # An external program or script which
                                         # can be executed by the user under which