diff --git a/wowchemy/config.toml b/wowchemy/config.toml
index 07697872..e8ce1682 100644
--- a/wowchemy/config.toml
+++ b/wowchemy/config.toml
@@ -1,5 +1,5 @@
 [module]
   [module.hugoVersion]
-    # This version of Academic is compatible with the following Hugo versions:
+    # This version of Wowchemy is compatible with the following Hugo versions:
     min = "0.73.0"
     extended = true
diff --git a/wowchemy/data/academic.toml b/wowchemy/data/wowchemy.toml
similarity index 63%
rename from wowchemy/data/academic.toml
rename to wowchemy/data/wowchemy.toml
index a13e6897..8da36a9f 100644
--- a/wowchemy/data/academic.toml
+++ b/wowchemy/data/wowchemy.toml
@@ -1,3 +1,3 @@
-# Academic
+# Wowchemy
 
 version = "4.8.0"
diff --git a/wowchemy/layouts/partials/site_head.html b/wowchemy/layouts/partials/site_head.html
index 3f08fe29..f653fa63 100644
--- a/wowchemy/layouts/partials/site_head.html
+++ b/wowchemy/layouts/partials/site_head.html
@@ -3,7 +3,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="generator" content="Source Themes Academic {{ site.Data.academic.version }}">
+  <meta name="generator" content="Wowchemy Hugo {{ site.Data.wowchemy.version }}">
 
   {{ $scr := .Scratch }}
 
@@ -138,15 +138,15 @@
     {{ end }}
   {{ end }}
 
-  {{ $css_comment := printf "/*!* Source Themes Academic v%s (https://sourcethemes.com/academic/) */\n" site.Data.academic.version }}
+  {{ $css_comment := printf "/*!* Wowchemy v%s (https://wowchemy.com/) */\n" site.Data.wowchemy.version }}
   {{ $css_bundle_head := $css_comment | resources.FromString "css/bundle-head.css" }}
-  {{ $css_options := dict "targetPath" "css/academic.css" }}
+  {{ $css_options := dict "targetPath" "css/wowchemy.css" }}
   {{- if (in (slice (getenv "HUGO_ENV") hugo.Environment) "production") -}}
     {{- $css_options = merge $css_options (dict "outputStyle" "compressed") -}}
   {{- end -}}
   {{ $sass_template := resources.Get "scss/main.scss" }}
   {{ $style := $sass_template | resources.ExecuteAsTemplate "main_parsed.scss" . | toCSS $css_options }}
-  {{ $style := slice $css_bundle_head $style | resources.Concat "css/academic.css" }}
+  {{ $style := slice $css_bundle_head $style | resources.Concat "css/wowchemy.css" }}
   {{- if (eq (getenv "HUGO_ENV") "production") -}}
     {{- $style = $style | minify | fingerprint "md5" -}}
   {{- end -}}
diff --git a/wowchemy/layouts/shortcodes/alert.html b/wowchemy/layouts/shortcodes/alert.html
index 9712fbdb..4d8837a7 100644
--- a/wowchemy/layouts/shortcodes/alert.html
+++ b/wowchemy/layouts/shortcodes/alert.html
@@ -1,3 +1,5 @@
+{{/* Todo: to be deprecated in favour of Callout. */}}
+{{ warnf "Alert shortcode will be deprecated in future. Use Callout instead. Rename `alert` to `callout` in %q" $.Page.Path }}
 <div class="alert alert-{{ .Get 0 }}">
   <div>
     {{ .Inner | markdownify | emojify }}
diff --git a/wowchemy/layouts/shortcodes/callout.html b/wowchemy/layouts/shortcodes/callout.html
new file mode 100644
index 00000000..9712fbdb
--- /dev/null
+++ b/wowchemy/layouts/shortcodes/callout.html
@@ -0,0 +1,5 @@
+<div class="alert alert-{{ .Get 0 }}">
+  <div>
+    {{ .Inner | markdownify | emojify }}
+  </div>
+</div>