Small changes to the new metadata JSON files.
Fix the TEMPLATE rename bug.