diff --git a/layouts/shortcodes/button.html b/layouts/shortcodes/button.html
index 70500aa65a..01e539f423 100644
--- a/layouts/shortcodes/button.html
+++ b/layouts/shortcodes/button.html
@@ -1,4 +1,7 @@
 {{- $_hugo_config := `{ "version": 1 }` }}
+{{- if (.Get "icon-position") }}
+  {{- warnf "%q: DEPRECATED parameter 'icon-position' for shortcode 'button' found, use 'iconposition' instead" .Page.File.Path }}
+{{- end }}
 {{- partial "shortcodes/button.html" (dict
   "page"          .Page
   "color"         (.Get "color")
diff --git a/layouts/shortcodes/include.html b/layouts/shortcodes/include.html
index 9782b54346..40ec01d72f 100644
--- a/layouts/shortcodes/include.html
+++ b/layouts/shortcodes/include.html
@@ -1,3 +1,6 @@
+{{- if (.Get "showfirstheading") }}
+  {{- warnf "%q: UNSUPPORTED parameter 'showfirstheading' for shortcode 'include' found, use 'hidefirstheading' instead; see https://mcshelby.github.io/hugo-theme-relearn/basics/migration/#420-2022-06-23" .Page.File.Path }}
+{{- end }}
 {{- partial "shortcodes/include.html" (dict
   "page"             .Page
   "file"             (.Get "file" | default (.Get 0))
diff --git a/layouts/shortcodes/tabs.html b/layouts/shortcodes/tabs.html
index 5a64f099df..b721cdac6b 100644
--- a/layouts/shortcodes/tabs.html
+++ b/layouts/shortcodes/tabs.html
@@ -3,7 +3,10 @@
 {{- $major := int (index $version 0) }}
 {{- $minor := int (index $version 1) }}
 {{- $color   := (.Get "color") }}
-{{- $groupid := (.Get "groupid") }}
+{{- $groupid := ((.Get "groupid") | default (.Get "groupId")) }}
+{{- if (.Get "groupId") }}
+  {{- warnf "%q: DEPRECATED parameter 'groupId' for shortcode 'tabs' found, use 'groupid' instead" .Page.File.Path }}
+{{- end }}
 {{- $icon    := (.Get "icon") }}
 {{- $style   := (.Get "style") }}
 {{- $title   := (.Get "title") }}