diff --git a/frontend/authenticator.vps.php b/frontend/authenticator.vps.php
index 40058db..c06395d 100644
--- a/frontend/authenticator.vps.php
+++ b/frontend/authenticator.vps.php
@@ -21,7 +21,7 @@ try
 	
 	if($sContainer->sUserId != $sUser->sId && $sUser->sAccessLevel < 20)
 	{
-		throw new UnauthorizedException("You are not authorized to control this container.");
+		throw new UnauthorizedException("You are not authorized to control this VPS.");
 	}
 	
 	$sRouterAuthenticated = true;
diff --git a/frontend/classes/class.container.php b/frontend/classes/class.container.php
index 570a61c..de71ddc 100644
--- a/frontend/classes/class.container.php
+++ b/frontend/classes/class.container.php
@@ -229,11 +229,11 @@ class Container extends CPHPDatabaseRecordClass
 	{
 		if($this->sStatus == CVM_STATUS_SUSPENDED)
 		{
-			throw new ContainerSuspendedException("No operations can be performed on this container beacuse it is suspended.", 1, $this->sInternalId);
+			throw new ContainerSuspendedException("No operations can be performed on this VPS beacuse it is suspended.", 1, $this->sInternalId);
 		}
 		elseif($this->sStatus == CVM_STATUS_TERMINATED)
 		{
-			throw new ContainerSuspendedException("No operations can be performed on this container beacuse it is terminated.", 1, $this->sInternalId);
+			throw new ContainerSuspendedException("No operations can be performed on this VPS beacuse it is terminated.", 1, $this->sInternalId);
 		}
 		else
 		{
@@ -424,7 +424,7 @@ class Container extends CPHPDatabaseRecordClass
 		}
 		else
 		{
-			throw new ContainerDestroyException("Destroying container failed: {$result->stderr}", $result->returncode, $this->sInternalId);
+			throw new ContainerDestroyException("Destroying VPS failed: {$result->stderr}", $result->returncode, $this->sInternalId);
 		}
 	}
 	
@@ -437,15 +437,15 @@ class Container extends CPHPDatabaseRecordClass
 		}
 		catch (ContainerDestroyException $e)
 		{
-			throw new ContainerReinstallException("Reinstalling container failed during destroying: " . $e->getMessage(), $e->getCode(), $this->sInternalId, $e);
+			throw new ContainerReinstallException("Reinstalling VPS failed during destroying: " . $e->getMessage(), $e->getCode(), $this->sInternalId, $e);
 		}
 		catch (ContainerCreateException $e)
 		{
-			throw new ContainerReinstallException("Reinstalling container failed during creation: " . $e->getMessage(), $e->getCode(), $this->sInternalId, $e);
+			throw new ContainerReinstallException("Reinstalling VPS failed during creation: " . $e->getMessage(), $e->getCode(), $this->sInternalId, $e);
 		}
 		catch (ContainerConfigureException $e)
 		{
-			throw new ContainerReinstallException("Reinstalling container failed during configuration: " . $e->getMessage(), $e->getCode(), $this->sInternalId, $e);
+			throw new ContainerReinstallException("Reinstalling VPS failed during configuration: " . $e->getMessage(), $e->getCode(), $this->sInternalId, $e);
 		}
 	}
 	
@@ -453,11 +453,11 @@ class Container extends CPHPDatabaseRecordClass
 	{
 		if($this->sStatus == CVM_STATUS_SUSPENDED && $forced == false)
 		{
-			throw new ContainerSuspendedException("The container cannot be started as it is suspended.", 1, $this->sInternalId);
+			throw new ContainerSuspendedException("The VPS cannot be started as it is suspended.", 1, $this->sInternalId);
 		}
 		elseif($this->sStatus == CVM_STATUS_TERMINATED && $forced == false)
 		{
-			throw new ContainerTerminatedException("The container cannot be started as it is terminated.", 1, $this->sInternalId);
+			throw new ContainerTerminatedException("The VPS cannot be started as it is terminated.", 1, $this->sInternalId);
 		}
 		else
 		{
@@ -481,11 +481,11 @@ class Container extends CPHPDatabaseRecordClass
 	{
 		if($this->sStatus == CVM_STATUS_SUSPENDED)
 		{
-			throw new ContainerSuspendedException("The container cannot be stopped as it is suspended.", 1, $this->sInternalId);
+			throw new ContainerSuspendedException("The VPS cannot be stopped as it is suspended.", 1, $this->sInternalId);
 		}
 		elseif($this->sStatus == CVM_STATUS_TERMINATED)
 		{
-			throw new ContainerTerminatedException("The container cannot be stopped as it is terminated.", 1, $this->sInternalId);
+			throw new ContainerTerminatedException("The VPS cannot be stopped as it is terminated.", 1, $this->sInternalId);
 		}
 		else
 		{
@@ -518,12 +518,12 @@ class Container extends CPHPDatabaseRecordClass
 			}
 			catch (ContainerStopException $e)
 			{
-				throw new ContainerSuspendException("Suspension failed as the container could not be stopped.", 1, $this->sInternalId, $e);
+				throw new ContainerSuspendException("Suspension failed as the VPS could not be stopped.", 1, $this->sInternalId, $e);
 			}
 		}
 		else
 		{
-			throw new ContainerSuspendException("The container is already suspended.", 1, $this->sInternalId);
+			throw new ContainerSuspendException("The VPS is already suspended.", 1, $this->sInternalId);
 		}
 	}
 	
@@ -539,12 +539,12 @@ class Container extends CPHPDatabaseRecordClass
 			}
 			catch (ContainerStartException $e)
 			{
-				throw new ContainerUnsuspendException("Unsuspension failed as the container could not be started.", 1, $this->sInternalId, $e);
+				throw new ContainerUnsuspendException("Unsuspension failed as the VPS could not be started.", 1, $this->sInternalId, $e);
 			}
 		}
 		else
 		{
-			throw new ContainerUnsuspendException("The container is not suspended.", 1, $this->sInternalId);
+			throw new ContainerUnsuspendException("The VPS is not suspended.", 1, $this->sInternalId);
 		}
 	}
 	
@@ -630,11 +630,11 @@ class Container extends CPHPDatabaseRecordClass
 	{
 		if($this->sStatus == CVM_STATUS_SUSPENDED)
 		{
-			throw new ContainerSuspendedException("The root password cannot be changed, because the container is suspended.", 1, $this->sInternalId);
+			throw new ContainerSuspendedException("The root password cannot be changed, because the VPS is suspended.", 1, $this->sInternalId);
 		}
 		elseif($this->sStatus == CVM_STATUS_TERMINATED)
 		{
-			throw new ContainerTerminatedException("The root password cannot be changed, because the container is terminated.", 1, $this->sInternalId);
+			throw new ContainerTerminatedException("The root password cannot be changed, because the VPS is terminated.", 1, $this->sInternalId);
 		}
 		else
 		{
diff --git a/frontend/cron.15.php b/frontend/cron.15.php
index 5b82a1c..6fc87ba 100644
--- a/frontend/cron.15.php
+++ b/frontend/cron.15.php
@@ -28,7 +28,7 @@ if($result = mysql_query_cached("SELECT * FROM containers"))
 		{
 			if($sContainer->sCurrentStatus == CVM_STATUS_STARTED)
 			{
-				// This is not supposed to fail, as the container is running.
+				// This is not supposed to fail, as the VPS is running.
 				// Something shady going on.
 				// TODO: Log exception
 			}
diff --git a/frontend/locales/english.lng b/frontend/locales/english.lng
index 64ce463..cdcd3bf 100644
--- a/frontend/locales/english.lng
+++ b/frontend/locales/english.lng
@@ -29,28 +29,28 @@ title-reinstall;							Reinstall your VPS
 title-password;								Set new root password
 title-console;								Out-of-band console
 title-admin-userlist;							User overview
-title-admin-containerlist;						Container overview
+title-admin-containerlist;						VPS overview
 title-admin-nodelist;							Node overview
 title-admin-addnode;							Add node
 title-admin-userinfo;							User lookup
 title-admin-nodeinfo;							Node lookup
 title-admin-overview;							Administrative overview
-title-admin-vps-suspend;						Suspend container
-title-admin-vps-unsuspend;						Unsuspend container
-title-admin-vps-transfer;						Transfer container ownership
-title-admin-vps-terminate;						Terminate container
+title-admin-vps-suspend;						Suspend VPS
+title-admin-vps-unsuspend;						Unsuspend VPS
+title-admin-vps-transfer;						Transfer VPS ownership
+title-admin-vps-terminate;						Terminate VPS
 
-header-admin-user-containers;						Containers owned by this user
-header-admin-node-containers;						Containers on this node
+header-admin-user-containers;						VPSs owned by this user
+header-admin-node-containers;						VPSs on this node
 header-vps-admin;							Administrative tasks
 
 button-login;								Login
 button-reinstall;							Reinstall
 button-password;							Set new root password
-button-admin-vps-suspend;						Suspend container
-button-admin-vps-unsuspend;						Unsuspend container
-button-admin-vps-transfer;						Transfer container
-button-admin-vps-terminate;						Terminate container
+button-admin-vps-suspend;						Suspend VPS
+button-admin-vps-unsuspend;						Unsuspend VPS
+button-admin-vps-transfer;						Transfer VPS
+button-admin-vps-terminate;						Terminate VPS
 button-admin-addnode;							Add node
 
 notfound;								The specified VPS was not found.
@@ -74,7 +74,7 @@ menu-password;								Root Password
 
 menu-admin-overview;							Overview
 menu-admin-users;							Users
-menu-admin-containers;							Containers
+menu-admin-containers;							VPSs
 menu-admin-nodes;							Nodes
 
 login-username;								Username
@@ -121,9 +121,9 @@ reinstall-patience;							(be patient; this may take a while)
 password-field-password;						New root password
 password-field-confirm;							Confirm password
 
-console-introduction;							If you cannot access your container for some reason, you can use the out-of-band console (also known as shell dropper) to invoke a root shell.
+console-introduction;							If you cannot access your VPS for some reason, you can use the out-of-band console (also known as shell dropper) to invoke a root shell.
 console-step1;								To use the out-of-band console, connect through SSH using the following details:
-console-step2;								After logging in with the above details, you will have to enter your VPS panel login details, after which you can select a container to invoke a root shell on.
+console-step2;								After logging in with the above details, you will have to enter your VPS panel login details, after which you can select a VPS to invoke a root shell on.
 console-title-hostname;							Hostname
 console-title-port;							Port
 console-title-username;							Username
@@ -133,7 +133,7 @@ admin-title-id;								User ID
 admin-title-username;							Username
 admin-title-email;							Email address
 admin-title-accesslevel;						Access level
-admin-title-containers;							Container count
+admin-title-containers;							VPS count
 admin-level-enduser;							End user
 admin-level-reseller;							Reseller
 admin-level-nodeadmin;							Node administrator
@@ -152,55 +152,55 @@ vps-admin-suspend;							Suspend / unsuspend
 vps-admin-transfer;							Transfer
 vps-admin-terminate;							Terminate
 
-vps-admin-suspend-text;							Are you sure you wish to suspend this container? The owner will no longer be able to use it, until it is unsuspended!
-vps-admin-unsuspend-text;						Are you sure you wish to unsuspend this container? The owner will be able to use it again.
+vps-admin-suspend-text;							Are you sure you wish to suspend this VPS? The owner will no longer be able to use it, until it is unsuspended!
+vps-admin-unsuspend-text;						Are you sure you wish to unsuspend this VPS? The owner will be able to use it again.
 
 error-logout-success-title;						Successfully logged out
 error-logout-success-text;						You have been successfully logged out. You can now close this page.
 error-logout-notloggedin-title;						You are not logged in
 error-logout-notloggedin-text;						You can only logout when you are already logged in.
-error-suspend-success-title;						Container suspended
-error-suspend-success-text;						The container has been suspended and can no longer be used by the owner.
-error-unsuspend-success-title;						Container unsuspended
-error-unsuspend-success-text;						The container has been unsuspended and can now be used by the owner again.
-error-suspend-error-title;						Failed to suspend container
-error-suspend-error-text;						The container could not be suspended.
-error-unsuspend-error-title;						Failed to unsuspend container
-error-unsuspend-error-text;						The container could not be unsuspended.
+error-suspend-success-title;						VPS suspended
+error-suspend-success-text;						The VPS has been suspended and can no longer be used by the owner.
+error-unsuspend-success-title;						VPS unsuspended
+error-unsuspend-success-text;						The VPS has been unsuspended and can now be used by the owner again.
+error-suspend-error-title;						Failed to suspend VPS
+error-suspend-error-text;						The VPS could not be suspended.
+error-unsuspend-error-title;						Failed to unsuspend VPS
+error-unsuspend-error-text;						The VPS could not be unsuspended.
 error-unauthorized-title;						You are not authorized to view this page
 error-unauthorized-text;						Your access level is not sufficient.
-error-notfound-title;							Container not found
-error-notfound-text;							The container you selected was not found.
-warning-suspended-title;						This container is suspended
-warning-suspended-text;							You cannot change any configuration or perform any actions on this container. If you feel this should not be the case, please contact support.
-warning-terminated-title;						This container has been terminated
-warning-terminated-text;						You cannot change any configuration or perform any actions on this container, as it is terminated.
-error-start-success-title;						Container started
-error-start-success-text;						Your container was successfully started.
-error-start-suspended-title;						Container is suspended
-error-start-suspended-text;						Your container could not be started, as it is currently suspended. If you believe this is in error, please file a support ticket.
-error-start-terminated-title;						Container is terminated
-error-start-terminated-text;						Your container could not be started, as it is terminated.
-error-start-failed-title;						Container failed to start
-error-start-failed-text;						Your container could not be started. If this error persists, please file a support ticket.
-error-start-running-title;						Container can't be started
-error-start-running-text;						Your container cannot be started because it is already running.
-error-stop-success-title;						Container stopped
-error-stop-success-text;						Your container was successfully stopped.
-error-stop-suspended-title;						Container is suspended
-error-stop-suspended-text;						Your container could not be stopped, as it is currently suspended. If you believe this is in error, please file a support ticket.
-error-stop-terminated-title;						Container is terminated
-error-stop-terminated-text;						Your container could not be stopped, as it is terminated.
-error-stop-failed-title;						Container failed to stop
-error-stop-failed-text;							Your container could not be stopped. If this error persists, please file a support ticket.
-error-stop-stopped-title;						Container can't be stopped
-error-stop-stopped-text;						Your container cannot be stopped because it is not running.
+error-notfound-title;							VPS not found
+error-notfound-text;							The VPS you selected was not found.
+warning-suspended-title;						This VPS is suspended
+warning-suspended-text;							You cannot change any configuration or perform any actions on this VPS. If you feel this should not be the case, please contact support.
+warning-terminated-title;						This VPS has been terminated
+warning-terminated-text;						You cannot change any configuration or perform any actions on this VPS, as it is terminated.
+error-start-success-title;						VPS started
+error-start-success-text;						Your VPS was successfully started.
+error-start-suspended-title;						VPS is suspended
+error-start-suspended-text;						Your VPS could not be started, as it is currently suspended. If you believe this is in error, please file a support ticket.
+error-start-terminated-title;						VPS is terminated
+error-start-terminated-text;						Your VPS could not be started, as it is terminated.
+error-start-failed-title;						VPS failed to start
+error-start-failed-text;						Your VPS could not be started. If this error persists, please file a support ticket.
+error-start-running-title;						VPS can't be started
+error-start-running-text;						Your VPS cannot be started because it is already running.
+error-stop-success-title;						VPS stopped
+error-stop-success-text;						Your VPS was successfully stopped.
+error-stop-suspended-title;						VPS is suspended
+error-stop-suspended-text;						Your VPS could not be stopped, as it is currently suspended. If you believe this is in error, please file a support ticket.
+error-stop-terminated-title;						VPS is terminated
+error-stop-terminated-text;						Your VPS could not be stopped, as it is terminated.
+error-stop-failed-title;						VPS failed to stop
+error-stop-failed-text;							Your VPS could not be stopped. If this error persists, please file a support ticket.
+error-stop-stopped-title;						VPS can't be stopped
+error-stop-stopped-text;						Your VPS cannot be stopped because it is not running.
 error-login-invalid-title;						Login failed
 error-login-invalid-text;						The login details you provided are invalid. Please try again.
 error-admin-user-title;							That user does not exist
 error-admin-user-text;							The user you tried to look up does not exist.
 error-password-success-title;						Password configuration succeeded!
-error-password-success-text;						Your new root password was successfully configured. Please ensure to change your root password again from your container after logging in.
+error-password-success-text;						Your new root password was successfully configured. Please ensure to change your root password again from your VPS after logging in.
 error-password-nomatch-title;						Passwords do not match
 error-password-nomatch-text;						Both entries must be identical. Please try again.
 error-password-missing-title;						Fields missing
@@ -212,7 +212,7 @@ error-password-terminated-text;						You can not configure the root password for
 error-password-invalid-title;						Failed to configure root password
 error-password-invalid-text;						Your password may be in an invalid format. Try again with a different password.
 warning-password-title;							Security warning
-warning-password-text;							Configuring your root password through this panel may expose it to the VPS provider. Only use this feature in an emergency situation, and always change your password again afterwards, from within your container.
+warning-password-text;							Configuring your root password through this panel may expose it to the VPS provider. Only use this feature in an emergency situation, and always change your password again afterwards, from within your VPS.
 error-reinstall-success-title;						Reinstallation succeeded!
 error-reinstall-success-text;						Your VPS was successfully reinstalled.
 error-reinstall-confirm-title;						Reinstallation aborted
@@ -229,14 +229,14 @@ error-reinstall-suspended-title;					Reinstallation aborted
 error-reinstall-suspended-text;						You can not reinstall this VPS, because it is suspended. If you believe this is in error, please contact support.
 error-reinstall-terminated-title;					Reinstallation aborted
 error-reinstall-terminated-text;					You can not reinstall this VPS, because it has been terminated.
-error-restart-success-title;						Container restarted
-error-restart-success-text;						Your container was successfully restarted.
-error-restart-suspended-title;						Container is suspended
-error-restart-suspended-text;						Your container could not be restarted, as it is currently suspended. If you believe this is in error, please file a support ticket.
-error-restart-terminated-title;						Container is terminated
-error-restart-terminated-text;						Your container could not be restarted, as it is terminated.
-error-restart-start-title;						Container failed to start
-error-restart-start-text;						Your container could not be started. If this error persists, please file a support ticket.
+error-restart-success-title;						VPS restarted
+error-restart-success-text;						Your VPS was successfully restarted.
+error-restart-suspended-title;						VPS is suspended
+error-restart-suspended-text;						Your VPS could not be restarted, as it is currently suspended. If you believe this is in error, please file a support ticket.
+error-restart-terminated-title;						VPS is terminated
+error-restart-terminated-text;						Your VPS could not be restarted, as it is terminated.
+error-restart-start-title;						VPS failed to start
+error-restart-start-text;						Your VPS could not be started. If this error persists, please file a support ticket.
 error-admin-nodes-add-name;						You did not fill in a valid name.
 error-admin-nodes-add-hostname;						You did not fill in a valid hostname.
 error-admin-nodes-add-location;						You did not fill in a valid physical location.