diff --git a/init/index.cgi b/init/index.cgi
index 7ff437c46..af512ed14 100755
--- a/init/index.cgi
+++ b/init/index.cgi
@@ -348,7 +348,6 @@ elsif ($init_mode eq "systemd" && $access{'bootup'}) {
 			$l = "edit_systemd.cgi?name=".&urlize($u->{'name'});
 			}
 		my $sname = $u->{'name'};
-		$sname =~ s/\.service$//;
 		print &ui_columns_row([
 			&ui_checkbox("d", $u->{'name'}, undef),
 			$u->{'boot'} == -1 ?
diff --git a/init/lang/en b/init/lang/en
index baedf6f53..f9c9e9947 100644
--- a/init/lang/en
+++ b/init/lang/en
@@ -221,29 +221,29 @@ upstart_eserver2=Server command does not exist
 upstart_eserver3=Only one server command can be entered
 upstart_return=upstart service
 
-systemd_title1=Create Systemd Service
-systemd_title2=Edit Systemd Service
-systemd_egone=Service no longer exists!
-systemd_elegacy=Not a systemd service!
-systemd_header=Systemd service details
-systemd_name=Service name
+systemd_title1=Create Systemd Unit
+systemd_title2=Edit Systemd Unit
+systemd_egone=Unit no longer exists!
+systemd_elegacy=Not a systemd unit!
+systemd_header=Systemd unit details
+systemd_name=Unit name
 systemd_file=Configuration file
-systemd_desc=Service description
+systemd_desc=Unit description
 systemd_start=Commands to run on startup
 systemd_stop=Commands to run on shutdown
-systemd_conf=Systemd configuration
+systemd_conf=Systemd unit configuration
 systemd_boot=Start at boot time?
 systemd_status=Current status
 systemd_status0=Not running
 systemd_status1=Running with PID $1
 systemd_status2=Running
 systemd_status3=Unknown!
-systemd_err=Failed to save systemd service
-systemd_ename=Missing or invalid-lookup systemd service name
-systemd_eclash=A service with the same name already exists
-systemd_edesc=Missing service description
-systemd_return=systemd service
-systemd_econf=No systemd configuration entered
+systemd_err=Failed to save systemd unit
+systemd_ename=Missing or invalid-lookup systemd unit name
+systemd_eclash=A unit with the same name already exists
+systemd_edesc=Missing unit description
+systemd_return=systemd unit
+systemd_econf=No systemd unit configuration entered
 systemd_estart=Missing commands to run on startup
 
 launchd_title1=Create Launchd Agent