diff --git a/storefront/.dockerdev/Dockerfile b/storefront/.dockerdev/Dockerfile
index 14855d7599..32b0b2e410 100644
--- a/storefront/.dockerdev/Dockerfile
+++ b/storefront/.dockerdev/Dockerfile
@@ -34,7 +34,7 @@ RUN apt-get update -qq && DEBIAN_FRONTEND=noninteractive apt-get -yq dist-upgrad
     nodejs \
   && rm -rf /var/lib/apt/lists/*
 
-ENV APP_USER=solidus_starter_frontend_user \
+ENV APP_USER=solidus_storefront_user \
     LANG=C.UTF-8 \
     BUNDLE_JOBS=4 \
     BUNDLE_RETRY=3
diff --git a/storefront/lib/testing_support/coverage.rb b/storefront/lib/testing_support/coverage.rb
index 6e64944f3a..dceb154e57 100644
--- a/storefront/lib/testing_support/coverage.rb
+++ b/storefront/lib/testing_support/coverage.rb
@@ -12,23 +12,6 @@
     SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
   end
 
-  def (SimpleCov::ResultAdapter).call(result)
-    result = result.transform_keys do |path|
-      template_path = path.sub(
-        "#{SimpleCov.root}/",
-        "#{SimpleCov.root}/../storefront/templates/"
-      )
-      File.exist?(template_path) ? template_path : path
-    end
-    result.each do |path, coverage|
-      next unless path.end_with?(".erb")
-
-      # Remove the extra trailing lines added by ERB
-      coverage[:lines] = coverage[:lines][...File.read(path).lines.size]
-    end
-    result
-  end
-
   SimpleCov.command_name("solidus:storefront")
   SimpleCov.merge_timeout(3600)
   SimpleCov.start("rails")
diff --git a/storefront/template.rb b/storefront/template.rb
index 13fe39d4c7..c8a21c4128 100644
--- a/storefront/template.rb
+++ b/storefront/template.rb
@@ -37,7 +37,7 @@
   if __FILE__.match?(%r{\Ahttps?://})
     require "uri"
     url_path = URI.parse(__FILE__).path
-    match = url_path.match(%r{\A/([^/]+)/([^/]+)/raw/(.+?)/starter_frontend/template\.rb\z})
+    match = url_path.match(%r{\A/([^/]+)/([^/]+)/raw/(.+?)/storefront/template\.rb\z})
     unless match
       say_status :error, shell.set_color(
         "Could not parse storefront template URL: #{__FILE__}\n" \