diff --git a/phpBB/config/default/container/services_storage.yml b/phpBB/config/default/container/services_storage.yml
index cd2e46731e..c9caab3f84 100644
--- a/phpBB/config/default/container/services_storage.yml
+++ b/phpBB/config/default/container/services_storage.yml
@@ -102,6 +102,7 @@ services:
             - '@content.visibility'
             - '@dbal.conn'
             - '@dispatcher'
+            - '@language'
             - '@request'
             - '@storage.attachment'
             - '@symfony_request'
diff --git a/phpBB/phpbb/storage/controller/attachment.php b/phpBB/phpbb/storage/controller/attachment.php
index f20d120bd8..cbf798e953 100644
--- a/phpBB/phpbb/storage/controller/attachment.php
+++ b/phpBB/phpbb/storage/controller/attachment.php
@@ -18,8 +18,9 @@ use phpbb\cache\service;
 use phpbb\config\config;
 use phpbb\content_visibility;
 use phpbb\db\driver\driver_interface;
-use phpbb\event\dispatcher;
+use phpbb\event\dispatcher_interface;
 use phpbb\exception\http_exception;
+use phpbb\language\language;
 use phpbb\request\request;
 use phpbb\storage\storage;
 use phpbb\user;
@@ -41,9 +42,12 @@ class attachment extends controller
 	/** @var content_visibility */
 	protected $content_visibility;
 
-	/** @var dispatcher */
+	/** @var dispatcher_interface */
 	protected $dispatcher;
 
+	/** @var \phpbb\language\language */
+	protected $language;
+
 	/** @var request */
 	protected $request;
 
@@ -59,12 +63,13 @@ class attachment extends controller
 	 * @param content_visibility	$content_visibility
 	 * @param driver_interface		$db
 	 * @param dispatcher_interface	$dispatcher
+	 * @param language				$language
 	 * @param request				$request
 	 * @param storage				$storage
 	 * @param symfony_request		$symfony_request
 	 * @param user					$user
 	 */
-	public function __construct(auth $auth, service $cache, config $config, content_visibility $content_visibility, driver_interface $db, dispatcher $dispatcher, request $request, storage $storage, symfony_request $symfony_request, user $user)
+	public function __construct(auth $auth, service $cache, config $config, content_visibility $content_visibility, driver_interface $db, dispatcher_interface $dispatcher, language $language, request $request, storage $storage, symfony_request $symfony_request, user $user)
 	{
 		parent::__construct($cache, $db, $storage, $symfony_request);
 
@@ -72,6 +77,7 @@ class attachment extends controller
 		$this->config = $config;
 		$this->content_visibility = $content_visibility;
 		$this->dispatcher = $dispatcher;
+		$this->language = $language;
 		$this->request = $request;
 		$this->user = $user;
 	}
@@ -84,7 +90,7 @@ class attachment extends controller
 		$attach_id = (int) $id;
 		$thumbnail = $this->request->variable('t', false);
 
-		$this->user->add_lang('viewtopic');
+		$this->language->add_lang('viewtopic');
 
 		if (!$this->config['allow_attachments'] && !$this->config['allow_pm_attach'])
 		{
@@ -96,7 +102,9 @@ class attachment extends controller
 			throw new http_exception(404, 'NO_ATTACHMENT_SELECTED');
 		}
 
-		$sql = 'SELECT attach_id, post_msg_id, topic_id, in_message, poster_id, is_orphan, physical_filename, real_filename, extension, mimetype, filesize, filetime
+		$sql = 'SELECT attach_id, post_msg_id, topic_id, in_message, poster_id,
+				is_orphan, physical_filename, real_filename, extension, mimetype,
+				filesize, filetime
 			FROM ' . ATTACHMENTS_TABLE . "
 			WHERE attach_id = $attach_id";
 		$result = $this->db->sql_query($sql);
@@ -114,7 +122,8 @@ class attachment extends controller
 
 		$attachment['physical_filename'] = utf8_basename($attachment['physical_filename']);
 
-		if (!$attachment['in_message'] && !$this->config['allow_attachments'] || $attachment['in_message'] && !$this->config['allow_pm_attach'])
+		if (!$attachment['in_message'] && !$this->config['allow_attachments'] ||
+			$attachment['in_message'] && !$this->config['allow_pm_attach'])
 		{
 			throw new http_exception(404, 'ATTACHMENT_FUNCTIONALITY_DISABLED');
 		}
@@ -124,7 +133,8 @@ class attachment extends controller
 			// We allow admins having attachment permissions to see orphan attachments...
 			$own_attachment = ($this->auth->acl_get('a_attach') || $attachment['poster_id'] == $this->user->data['user_id']) ? true : false;
 
-			if (!$own_attachment || ($attachment['in_message'] && !$this->auth->acl_get('u_pm_download')) || (!$attachment['in_message'] && !$this->auth->acl_get('u_download')))
+			if (!$own_attachment || ($attachment['in_message'] && !$this->auth->acl_get('u_pm_download')) ||
+				(!$attachment['in_message'] && !$this->auth->acl_get('u_download')))
 			{
 				throw new http_exception(404, 'ERROR_NO_ATTACHMENT');
 			}
diff --git a/phpBB/phpbb/storage/controller/avatar.php b/phpBB/phpbb/storage/controller/avatar.php
index a6ec3339e1..c657773374 100644
--- a/phpBB/phpbb/storage/controller/avatar.php
+++ b/phpBB/phpbb/storage/controller/avatar.php
@@ -52,7 +52,7 @@ class avatar extends controller
 	 */
 	public function handle($file)
 	{
-		$file = $this->decode_avatar_filename($file);
+		$file = $this->decode_filename($file);
 
 		return parent::handle($file);
 	}
@@ -75,7 +75,7 @@ class avatar extends controller
 	 *
 	 * @return string Filename in filesystem
 	 */
-	protected function decode_avatar_filename($file)
+	protected function decode_filename($file)
 	{
 		$avatar_group = false;
 
diff --git a/phpBB/phpbb/storage/controller/controller.php b/phpBB/phpbb/storage/controller/controller.php
index f2bc16ad0a..5c199ff2cd 100644
--- a/phpBB/phpbb/storage/controller/controller.php
+++ b/phpBB/phpbb/storage/controller/controller.php
@@ -44,7 +44,7 @@ class controller
 	 * Constructor
 	 *
 	 * @param service				$cache
-	 * @param driver_interfacd		$db
+	 * @param driver_interface		$db
 	 * @param storage				$storage
 	 * @param symfony_request		$symfony_request
 	 */
@@ -127,7 +127,7 @@ class controller
 		{
 			try
 			{
-				$content_type = $file_info->mimetype;
+				$content_type = $file_info->get('mimetype');
 			}
 			catch (\phpbb\storage\exception\exception $e)
 			{
@@ -141,7 +141,7 @@ class controller
 		{
 			try
 			{
-				$this->response->headers->set('Content-Length', $file_info->size);
+				$this->response->headers->set('Content-Length', $file_info->get('size'));
 			}
 			catch (\phpbb\storage\exception\exception $e)
 			{
@@ -174,8 +174,6 @@ class controller
 
 	/**
 	* Garbage Collection
-	*
-	* @param bool $exit		Whether to die or not
 	*/
 	protected function file_gc()
 	{