diff --git a/layouts/partials/paige/link.html b/layouts/partials/paige/link.html
index 43ea007b..d4b2108e 100644
--- a/layouts/partials/paige/link.html
+++ b/layouts/partials/paige/link.html
@@ -12,7 +12,7 @@
 {{ $outputstyle := cond hugo.IsProduction "compressed" "" }}
 
 {{ if not $href }}
-    {{ errorf "paige/link: no href" }}
+    {{ errorf "layouts/partials/paige/link.html: no href" }}
 {{ end }}
 
 {{ with partial "paige/resource.html" $href }}
diff --git a/layouts/partials/paige/menu.html b/layouts/partials/paige/menu.html
index 75af2536..097e6e56 100644
--- a/layouts/partials/paige/menu.html
+++ b/layouts/partials/paige/menu.html
@@ -20,7 +20,7 @@
     {{ else if eq . "underline" }}
         {{ $underline = true }}
     {{ else if ne . "links" }}
-        {{ errorf "paige/menu: invalid menu style: %q" . }}
+        {{ errorf "layouts/partials/paige/menu.html: invalid menu style: %q" . }}
     {{ end }}
 {{ else }}
     {{ $pills = true }}
diff --git a/layouts/partials/paige/resource.html b/layouts/partials/paige/resource.html
index da345850..60edc971 100644
--- a/layouts/partials/paige/resource.html
+++ b/layouts/partials/paige/resource.html
@@ -5,7 +5,7 @@
 {{ if (urls.Parse $url).Scheme }}
     {{ with resources.GetRemote $url }}
         {{ with .Err }}
-            {{ errorf "paige/resource: cannot get remote resource %q: %v" $url . }}
+            {{ errorf "layouts/partials/paige/resource.html: cannot get remote resource %q: %v" $url . }}
         {{ else }}
             {{ $result = . }}
         {{ end }}
diff --git a/layouts/partials/paige/script.html b/layouts/partials/paige/script.html
index 2362456e..93998d9a 100644
--- a/layouts/partials/paige/script.html
+++ b/layouts/partials/paige/script.html
@@ -9,7 +9,7 @@
 {{ $type := $params.type }}
 
 {{ if not $src }}
-    {{ errorf "paige/script: no src" }}
+    {{ errorf "layouts/partials/paige/script.html: no src" }}
 {{ end }}
 
 {{ with partial "paige/resource.html" $src }}
diff --git a/layouts/shortcodes/paige/code.html b/layouts/shortcodes/paige/code.html
index 4c0c0d02..1aaf1e2d 100644
--- a/layouts/shortcodes/paige/code.html
+++ b/layouts/shortcodes/paige/code.html
@@ -3,7 +3,7 @@
 {{ $options := .Get "options" }}
 
 {{ if not $content }}
-    {{ errorf "paige/code: no content" }}
+    {{ errorf "layouts/shortcodes/paige/code.html: no content" }}
 {{ end }}
 
 <div class="paige-code">{{ highlight $content $lang $options }}</div>
diff --git a/layouts/shortcodes/paige/figure.html b/layouts/shortcodes/paige/figure.html
index 2938a12f..812d0116 100644
--- a/layouts/shortcodes/paige/figure.html
+++ b/layouts/shortcodes/paige/figure.html
@@ -9,7 +9,7 @@
 {{ $width := .Get "width" }}
 
 {{ if not $content }}
-    {{ errorf "paige/figure: no content" }}
+    {{ errorf "layouts/shortcodes/paige/figure.html: no content" }}
 {{ end }}
 
 {{ $showcaption := $caption }}
@@ -37,7 +37,7 @@
     {{ else if eq $float "end" }}
         {{ $sidemargin = "ms-4" }}
     {{ else }}
-        {{ errorf "paige/figure: invalid float: %q" $float }}
+        {{ errorf "layouts/shortcodes/paige/figure.html: invalid float: %q" $float }}
     {{ end }}
 {{ end }}
 
diff --git a/layouts/shortcodes/paige/gallery.html b/layouts/shortcodes/paige/gallery.html
index 55a81d71..5336e0f2 100644
--- a/layouts/shortcodes/paige/gallery.html
+++ b/layouts/shortcodes/paige/gallery.html
@@ -15,7 +15,7 @@
 {{ $resources := slice }}
 
 {{ if and (not $images) (not $inner) }}
-    {{ errorf "paige/gallery: no content" }}
+    {{ errorf "layouts/shortcodes/paige/gallery.html: no content" }}
 {{ end }}
 
 {{ if not $inner }}
@@ -80,6 +80,6 @@
             {{ end }}
         </div>
     {{ else }}
-        {{ errorf "paige/gallery: invalid type: %q" $type }}
+        {{ errorf "layouts/shortcodes/paige/gallery.html: invalid type: %q" $type }}
     {{ end }}
 </div>
diff --git a/layouts/shortcodes/paige/icon.html b/layouts/shortcodes/paige/icon.html
index c6cbbb20..3c537321 100644
--- a/layouts/shortcodes/paige/icon.html
+++ b/layouts/shortcodes/paige/icon.html
@@ -3,7 +3,7 @@
 {{ $url := .Get "url" }}
 
 {{ if not $class }}
-    {{ errorf "paige/icon: no class" }}
+    {{ errorf "layouts/shortcodes/paige/icon.html: no class" }}
 {{ end }}
 
 <span class="paige-icon">
diff --git a/layouts/shortcodes/paige/quote.html b/layouts/shortcodes/paige/quote.html
index 9d7b75d5..525fd1c9 100644
--- a/layouts/shortcodes/paige/quote.html
+++ b/layouts/shortcodes/paige/quote.html
@@ -2,7 +2,7 @@
 {{ $content := .Inner | replaceRE "^\n" "" | replaceRE "\n$" "" | markdownify }}
 
 {{ if not $content }}
-    {{ errorf "paige/quote: no content" }}
+    {{ errorf "layouts/shortcodes/paige/quote.html: no content" }}
 {{ end }}
 
 <div class="paige-quote">
diff --git a/layouts/shortcodes/paige/vimeo.html b/layouts/shortcodes/paige/vimeo.html
index a6dfcd5c..21d80b73 100644
--- a/layouts/shortcodes/paige/vimeo.html
+++ b/layouts/shortcodes/paige/vimeo.html
@@ -27,7 +27,7 @@
 {{ $width := .Get "width" }}
 
 {{ if not $video }}
-    {{ errorf "paige/vimeo: no video" }}
+    {{ errorf "layouts/shortcodes/paige/vimeo.html: no video" }}
 {{ end }}
 
 {{ $params := slice }}
diff --git a/layouts/shortcodes/paige/youtube.html b/layouts/shortcodes/paige/youtube.html
index 6c90c69b..8dc1bfb6 100644
--- a/layouts/shortcodes/paige/youtube.html
+++ b/layouts/shortcodes/paige/youtube.html
@@ -15,7 +15,7 @@
 {{ $width := .Get "width" }}
 
 {{ if not $video }}
-    {{ errorf "paige/youtube: no video" }}
+    {{ errorf "layouts/shortcodes/paige/youtube.html: no video" }}
 {{ end }}
 
 {{ $host := cond site.Config.Privacy.YouTube.PrivacyEnhanced "www.youtube-nocookie.com" "www.youtube.com" }}