Template renaming for consistency. (Fixes #441).