diff --git a/.htaccess b/.htaccess
index 5bf7b321f0cc..d19162fd7147 100644
--- a/.htaccess
+++ b/.htaccess
@@ -72,3 +72,7 @@ Options -Indexes
 <IfModule pagespeed_module>
   ModPagespeed Off
 </IfModule>
+#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####
+
+ErrorDocument 403 /core/templates/403.php
+ErrorDocument 404 /core/templates/404.php
diff --git a/lib/private/Files/Mount/ObjectHomeMountProvider.php b/lib/private/Files/Mount/ObjectHomeMountProvider.php
index aa6a443971f0..6903a5fd101e 100644
--- a/lib/private/Files/Mount/ObjectHomeMountProvider.php
+++ b/lib/private/Files/Mount/ObjectHomeMountProvider.php
@@ -53,9 +53,9 @@ public function __construct(IConfig $config) {
 	 */
 	public function getHomeMountForUser(IUser $user, IStorageFactory $loader) {
 
-		$config = $this->multiBucketObjectStore($user);
+		$config = $this->getMultiBucketObjectStoreConfig($user);
 		if ($config === null) {
-			$config = $this->singleBucketObjectStore($user);
+			$config = $this->getSingleBucketObjectStoreConfig($user);
 		}
 
 		if ($config === null) {
@@ -69,7 +69,7 @@ public function getHomeMountForUser(IUser $user, IStorageFactory $loader) {
 	 * @param IUser $user
 	 * @return array|null
 	 */
-	private function singleBucketObjectStore(IUser $user) {
+	private function getSingleBucketObjectStoreConfig(IUser $user) {
 		$config = $this->config->getSystemValue('objectstore');
 		if (!is_array($config)) {
 			return null;
@@ -93,7 +93,7 @@ private function singleBucketObjectStore(IUser $user) {
 	 * @param IUser $user
 	 * @return array|null
 	 */
-	private function multiBucketObjectStore(IUser $user) {
+	private function getMultiBucketObjectStoreConfig(IUser $user) {
 		$config = $this->config->getSystemValue('objectstore_multibucket');
 		if (!is_array($config)) {
 			return null;
diff --git a/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php b/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php
index f62dab093b44..202c2c02b987 100644
--- a/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php
+++ b/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php
@@ -42,7 +42,7 @@ public function testSingleBucket() {
 		$this->user->expects($this->never())->method($this->anything());
 		$this->loader->expects($this->never())->method($this->anything());
 
-		$config = $this->invokePrivate($this->provider, 'singleBucketObjectStore', [$this->user, $this->loader]);
+		$config = $this->invokePrivate($this->provider, 'getSingleBucketObjectStoreConfig', [$this->user, $this->loader]);
 
 		$this->assertArrayHasKey('class', $config);
 		$this->assertEquals($config['class'], 'Test\Files\Mount\FakeObjectStore');
@@ -66,7 +66,7 @@ public function testMultiBucket() {
 			->willReturn('uid');
 		$this->loader->expects($this->never())->method($this->anything());
 
-		$config = $this->invokePrivate($this->provider, 'multiBucketObjectStore', [$this->user, $this->loader]);
+		$config = $this->invokePrivate($this->provider, 'getMultiBucketObjectStoreConfig', [$this->user, $this->loader]);
 
 		$this->assertArrayHasKey('class', $config);
 		$this->assertEquals($config['class'], 'Test\Files\Mount\FakeObjectStore');
@@ -95,7 +95,7 @@ public function testMultiBucketWithPrefix() {
 			->willReturn('uid');
 		$this->loader->expects($this->never())->method($this->anything());
 
-		$config = $this->invokePrivate($this->provider, 'multiBucketObjectStore', [$this->user, $this->loader]);
+		$config = $this->invokePrivate($this->provider, 'getMultiBucketObjectStoreConfig', [$this->user, $this->loader]);
 
 		$this->assertArrayHasKey('class', $config);
 		$this->assertEquals($config['class'], 'Test\Files\Mount\FakeObjectStore');