diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77264f70..174d085b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@
 - Use `# length=x` comments to generate passwords with `pwgen` and drop `KEY`/`PASSWORD` logic ([#68](https://git.autonomic.zone/coop-cloud/abra/issues/68))
 - Global `--skip-update|-U` / `--skip-check|-C` options to make things quicker ([37e8b00](https://git.autonomic.zone/coop-cloud/abra/commit/37e8b00))
 - `app backup` and `app restore` commands; requires per-app definition ([#70](https://git.autonomic.zone/coop-cloud/abra/issues/70))
+- Rename per-type `abra-commands.sh` to `abra.sh`, and include config versions as type-level instead of app-level config ([#43](https://git.autonomic.zone/coop-cloud/abra/issues/43))
 
 # abra 0.4.1 (2020-12-24)
 
diff --git a/abra b/abra
index 4eef4358..3a448266 100755
--- a/abra
+++ b/abra
@@ -401,11 +401,11 @@ fi
 
 ###### Run-time loading
 
-load_custom_commands() {
+load_abra_sh() {
   if [ -f abra.sh ]; then
     # shellcheck disable=SC1091
     source abra.sh
-    info "Loading custom commands from abra.sh"
+    info "Loading abra.sh"
   fi
 
   if [ -n "$abra__app_" ]; then
@@ -415,7 +415,7 @@ load_custom_commands() {
   fi
 
   if [ -f "$APP_DIR/abra.sh" ]; then
-    info "Loading custom commands from $APP_DIR/abra.sh"
+    info "Loading $APP_DIR/abra.sh"
     # shellcheck disable=SC1090,SC1091
     source "$APP_DIR/abra.sh"
   fi
@@ -1486,7 +1486,7 @@ abra() {
     set +a
   fi
 
-  load_custom_commands
+  load_abra_sh
 
   # Search for sub_* functions, and check if any of them matches enabled
   # arguments (i.e. is a command and is specified)