diff --git a/htdocs/js/pages/admin/Activity.js b/htdocs/js/pages/admin/Activity.js
index 6b5254f3..c249a5cd 100644
--- a/htdocs/js/pages/admin/Activity.js
+++ b/htdocs/js/pages/admin/Activity.js
@@ -164,7 +164,7 @@ Class.add( Page.Admin, {
 				break;
 				case 'master_server': // legacy
 				case 'server_master': // current
-					desc = 'Server has become master: <b>' + item.hostname + '</b>';
+					desc = 'Server has become primary: <b>' + item.hostname + '</b>';
 				break;
 				
 				case 'server_restart': 
@@ -207,7 +207,7 @@ Class.add( Page.Admin, {
 				
 				// scheduler
 				case 'state_update':
-					desc = 'Scheduler master switch was <b>' + (item.enabled ? 'enabled' : 'disabled') + '</b>';
+					desc = 'Scheduler was <b>' + (item.enabled ? 'enabled' : 'disabled') + '</b>';
 				break;
 				
 				// errors
diff --git a/htdocs/js/pages/admin/Servers.js b/htdocs/js/pages/admin/Servers.js
index ebd41f1f..eadc7985 100644
--- a/htdocs/js/pages/admin/Servers.js
+++ b/htdocs/js/pages/admin/Servers.js
@@ -105,7 +105,7 @@ Class.add( Page.Admin, {
 				'<div class="td_big">' + self.getNiceGroup(null, server.hostname, col_width) + '</div>',
 				(server.ip || 'n/a').replace(/^\:\:ffff\:(\d+\.\d+\.\d+\.\d+)$/, '$1'),
 				group_names.length ? group_names.join(', ') : '(None)',
-				server.master ? '<span class="color_label green"><i class="fa fa-check">&nbsp;</i>Master</span>' : (eligible ? '<span class="color_label purple">Backup</span>' : '<span class="color_label blue">Slave</span>'),
+				server.master ? '<span class="color_label green"><i class="fa fa-check">&nbsp;</i>Primary</span>' : (eligible ? '<span class="color_label purple">Backup</span>' : '<span class="color_label blue">Worker</span>'),
 				num_jobs ? commify( num_jobs ) : '(None)',
 				get_text_from_seconds( server.uptime, true, true ).replace(/\bday\b/, 'days'),
 				short_float(cpu) + '%',
@@ -165,7 +165,7 @@ Class.add( Page.Admin, {
 				// group.description || '(No description)',
 				num_servers ? commify( num_servers) : '(None)',
 				num_events ? commify( num_events ) : '(None)',
-				group.master ? '<b>Master Eligible</b>' : 'Slave Only',
+				group.master ? '<b>Primary Eligible</b>' : 'Worker Only',
 				actions.join(' | ')
 			];
 		} );
@@ -279,8 +279,8 @@ Class.add( Page.Admin, {
 			get_form_table_row('Hostname Match:', '<input type="text" id="fe_eg_regexp" size="30" style="font-family:monospace; font-size:13px;" value="'+escape_text_field_value(group.regexp)+'" spellcheck="false"/>') + 
 			get_form_table_caption("Enter a regular expression to auto-assign servers to this group by their hostnames, e.g. \"^mtx\\d+\\.\".") + 
 			get_form_table_spacer() + 
-			get_form_table_row('Server Class:', '<select id="fe_eg_master">' + render_menu_options([ [1,'Master Eligible'], [0,'Slave Only'] ], group.master, false) + '</select>') + 
-			get_form_table_caption("Select whether servers in the group are eligible to become the master server, or run as slaves only.") + 
+			get_form_table_row('Server Class:', '<select id="fe_eg_master">' + render_menu_options([ [1,'Primary Eligible'], [0,'Worker Only'] ], group.master, false) + '</select>') + 
+			get_form_table_caption("Select whether servers in the group are eligible to become the primary server, or run as workers only.") + 
 		'</table>';
 		
 		app.confirm( '<i class="mdi mdi-server-network">&nbsp;&nbsp;</i>' + (edit ? "Edit Server Group" : "Add Server Group"), html, edit ? "Save Changes" : "Add Group", function(result) {
@@ -331,7 +331,7 @@ Class.add( Page.Admin, {
 				if (this.server_groups[idx].master) num_masters++;
 			}
 			if (num_masters == 1) {
-				return app.doError("Sorry, you cannot delete the last Master Eligible server group.");
+				return app.doError("Sorry, you cannot delete the last Primary Eligible server group.");
 			}
 		}
 		
diff --git a/lib/api/admin.js b/lib/api/admin.js
index 902fca99..ae28efe0 100644
--- a/lib/api/admin.js
+++ b/lib/api/admin.js
@@ -34,7 +34,7 @@ module.exports = Class.create({
 			return this.doError('server', "Server is already a master server, controlling its own cluster.", callback);
 		}
 		if (this.multi.masterHostname && (this.multi.masterHostname != params.master)) {
-			return this.doError('server', "Server is already a member of a cluster (Master: " + this.multi.masterHostname + ")", callback);
+			return this.doError('server', "Server is already a member of a cluster (Primary: " + this.multi.masterHostname + ")", callback);
 		}
 		
 		callback({ code: 0, hostname: this.server.hostname, ip: this.server.ip });
diff --git a/package.json b/package.json
index 059023af..77d9c56c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "Cronicle",
-	"version": "0.8.47",
+	"version": "0.8.48",
 	"description": "A simple, distributed task scheduler and runner with a web based UI.",
 	"author": "Joseph Huckaby <jhuckaby@gmail.com>",
 	"homepage": "https://github.com/jhuckaby/Cronicle",
diff --git a/sample_conf/setup.json b/sample_conf/setup.json
index 3363109e..403d107c 100644
--- a/sample_conf/setup.json
+++ b/sample_conf/setup.json
@@ -80,7 +80,7 @@
 		[ "listCreate", "global/server_groups", {} ],
 		[ "listPush", "global/server_groups", {
 			"id": "maingrp",
-			"title": "Master Group",
+			"title": "Primary Group",
 			"regexp": "_HOSTNAME_",
 			"master": 1
 		} ],