diff --git a/fmt-my-stuff b/fmt-my-stuff
index e609c908f..a7b44ac1b 100755
--- a/fmt-my-stuff
+++ b/fmt-my-stuff
@@ -9,4 +9,4 @@ fi
 BASE="$(readlink -f "$0" 2>/dev/null || python -c 'import os,sys;print(os.path.realpath(sys.argv[1]))' "$0")"
 BASE="$(dirname "$BASE")"
 
-grep -lr $1 "$BASE/data/" | while read line; do utils/schema-check/dn42-schema.py fmt -i "$line"; done
+grep -lrE "(\s|:)$1(\s|\$)" "$BASE/data/" | while read line; do utils/schema-check/dn42-schema.py fmt -i "$line"; done