@bseeger This implements my suggested changes to your rename-template branch. Once these are in, we can merge your PR into master.
rename-template