diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index c6f62869de..5c0f9a3eed 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -234,16 +234,6 @@ $lang = array_merge($lang, array(
 
 	'BACK'					=> 'Back',
 
-	'CANNOT_CHANGE_FILE_GROUP'	=> 'Unable to change file group',
-	'CANNOT_CHANGE_FILE_PERMISSIONS'	=> 'Unable to change file permissions',
-	'CANNOT_COPY_FILES'		=> 'Unable to copy files',
-	'CANNOT_CREATE_SYMLINK'	=> 'Unable to create a symlink',
-	'CANNOT_DELETE_FILES'	=> 'Unable to delete files from the system',
-	'CANNOT_DUMP_FILE'		=> 'Unable to dump file',
-	'CANNOT_MIRROR_DIRECTORY'	=> 'Unable to mirror directory',
-	'CANNOT_RENAME_FILE'	=> 'Unable to rename a file from the system',
-	'CANNOT_TOUCH_FILES'	=> 'Unable to determine if the file exists',
-
 	'CONTAINER_EXCEPTION' => 'phpBB encountered an error building the container due to an installed extension. For this reason, all extensions have been temporarily disabled. Please try purging your forum cache. All extensions will automatically be re-enabled once the container error is resolved. If this error continues, please visit <a href="https://www.phpbb.com/support">phpBB.com</a> for support.',
 	'EXCEPTION' => 'Exception',
 
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index c7325043b2..98f3dda2c1 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -157,7 +157,6 @@ $lang = array_merge($lang, array(
 	'BYTES_SHORT'			=> 'B',
 
 	'CANCEL'				=> 'Cancel',
-	'CANNOT_RENAME_FILE'	=> 'Cannot rename %s',
 	'CHANGE'				=> 'Change',
 	'CHANGE_FONT_SIZE'		=> 'Change font size',
 	'CHANGING_PREFERENCES'	=> 'Changing board preferences',
@@ -268,6 +267,17 @@ $lang = array_merge($lang, array(
 	'FSOCK_DISABLED'		=> 'The operation could not be completed because the <var>fsockopen</var> function has been disabled or the server being queried could not be found.',
 	'FSOCK_TIMEOUT'			=> 'A timeout occurred while reading from the network stream.',
 
+	'FILESYSTEM_CANNOT_CHANGE_FILE_GROUP'		=> 'Unable to change file group',
+	'FILESYSTEM_CANNOT_CHANGE_FILE_PERMISSIONS'	=> 'Unable to change file permissions',
+	'FILESYSTEM_CANNOT_COPY_FILES'				=> 'Unable to copy files',
+	'FILESYSTEM_CANNOT_CREATE_SYMLINK'			=> 'Unable to create a symlink',
+	'FILESYSTEM_CANNOT_CREATE_DIRECTORY'		=> 'Unable to create directory',
+	'FILESYSTEM_CANNOT_DELETE_FILES'			=> 'Unable to delete files from the system',
+	'FILESYSTEM_CANNOT_DUMP_FILE'				=> 'Unable to dump file',
+	'FILESYSTEM_CANNOT_MIRROR_DIRECTORY'		=> 'Unable to mirror directory',
+	'FILESYSTEM_CANNOT_RENAME_FILE'				=> 'Unable to rename a file from the system',
+	'FILESYSTEM_CANNOT_TOUCH_FILES'				=> 'Unable to determine if the file exists',
+
 	'FTP_FSOCK_HOST'				=> 'FTP host',
 	'FTP_FSOCK_HOST_EXPLAIN'		=> 'FTP server used to connect your site.',
 	'FTP_FSOCK_PASSWORD'			=> 'FTP password',
diff --git a/phpBB/phpbb/filesystem/filesystem.php b/phpBB/phpbb/filesystem/filesystem.php
index d168d6c90a..145def7f42 100644
--- a/phpBB/phpbb/filesystem/filesystem.php
+++ b/phpBB/phpbb/filesystem/filesystem.php
@@ -68,7 +68,7 @@ class filesystem implements filesystem_interface
 			$error = trim($e->getMessage());
 			$file = substr($error, strrpos($error, ' '));
 
-			throw new filesystem_exception('CANNOT_CHANGE_FILE_GROUP', $file, array(), $e);
+			throw new filesystem_exception('FILESYSTEM_CANNOT_CHANGE_FILE_GROUP', $file, array(), $e);
 		}
 	}
 
@@ -125,14 +125,14 @@ class filesystem implements filesystem_interface
 			{
 				if (true !== @chmod($file, $dir_perm))
 				{
-					throw new filesystem_exception('CANNOT_CHANGE_FILE_PERMISSIONS', $file,  array());
+					throw new filesystem_exception('FILESYSTEM_CANNOT_CHANGE_FILE_PERMISSIONS', $file,  array());
 				}
 			}
 			else if (is_file($file))
 			{
 				if (true !== @chmod($file, $file_perm))
 				{
-					throw new filesystem_exception('CANNOT_CHANGE_FILE_PERMISSIONS', $file,  array());
+					throw new filesystem_exception('FILESYSTEM_CANNOT_CHANGE_FILE_PERMISSIONS', $file,  array());
 				}
 			}
 		}
@@ -154,7 +154,7 @@ class filesystem implements filesystem_interface
 			$error = trim($e->getMessage());
 			$file = substr($error, strrpos($error, ' '));
 
-			throw new filesystem_exception('CANNOT_CHANGE_FILE_GROUP', $file, array(), $e);
+			throw new filesystem_exception('FILESYSTEM_CANNOT_CHANGE_FILE_GROUP', $file, array(), $e);
 		}
 	}
 
@@ -177,7 +177,7 @@ class filesystem implements filesystem_interface
 		}
 		catch (IOException $e)
 		{
-			throw new filesystem_exception('CANNOT_COPY_FILES', '', array(), $e);
+			throw new filesystem_exception('FILESYSTEM_CANNOT_COPY_FILES', '', array(), $e);
 		}
 	}
 
@@ -192,7 +192,7 @@ class filesystem implements filesystem_interface
 		}
 		catch (IOException $e)
 		{
-			throw new filesystem_exception('CANNOT_DUMP_FILE', $filename, array(), $e);
+			throw new filesystem_exception('FILESYSTEM_CANNOT_DUMP_FILE', $filename, array(), $e);
 		}
 	}
 
@@ -304,7 +304,7 @@ class filesystem implements filesystem_interface
 			$msg = $e->getMessage();
 			$filename = substr($msg, strpos($msg, '"'), strrpos($msg, '"'));
 
-			throw new filesystem_exception('CANNOT_MIRROR_DIRECTORY', $filename, array(), $e);
+			throw new filesystem_exception('FILESYSTEM_CANNOT_MIRROR_DIRECTORY', $filename, array(), $e);
 		}
 	}
 
@@ -322,7 +322,7 @@ class filesystem implements filesystem_interface
 			$msg = $e->getMessage();
 			$filename = substr($msg, strpos($msg, '"'), strrpos($msg, '"'));
 
-			throw new filesystem_exception('CANNOT_CREATE_DIRECTORY', $filename, array(), $e);
+			throw new filesystem_exception('FILESYSTEM_CANNOT_CREATE_DIRECTORY', $filename, array(), $e);
 		}
 	}
 
@@ -487,7 +487,7 @@ class filesystem implements filesystem_interface
 			$error = trim($e->getMessage());
 			$file = substr($error, strrpos($error, ' '));
 
-			throw new filesystem_exception('CANNOT_DELETE_FILES', $file, array(), $e);
+			throw new filesystem_exception('FILESYSTEM_CANNOT_DELETE_FILES', $file, array(), $e);
 		}
 	}
 
@@ -505,7 +505,7 @@ class filesystem implements filesystem_interface
 			$msg = $e->getMessage();
 			$filename = substr($msg, strpos($msg, '"'), strrpos($msg, '"'));
 
-			throw new filesystem_exception('CANNOT_RENAME_FILE', $filename, array(), $e);
+			throw new filesystem_exception('FILESYSTEM_CANNOT_RENAME_FILE', $filename, array(), $e);
 		}
 	}
 
@@ -520,7 +520,7 @@ class filesystem implements filesystem_interface
 		}
 		catch (IOException $e)
 		{
-			throw new filesystem_exception('CANNOT_CREATE_SYMLINK', $origin_dir, array(), $e);
+			throw new filesystem_exception('FILESYSTEM_CANNOT_CREATE_SYMLINK', $origin_dir, array(), $e);
 		}
 	}
 
@@ -540,7 +540,7 @@ class filesystem implements filesystem_interface
 			$error = trim($e->getMessage());
 			$file = substr($error, strrpos($error, ' '));
 
-			throw new filesystem_exception('CANNOT_TOUCH_FILES', $file, array(), $e);
+			throw new filesystem_exception('FILESYSTEM_CANNOT_TOUCH_FILES', $file, array(), $e);
 		}
 	}