MRN-671
Rename and order templates in a human-readable way

Change-Id: Ie8a152e40e5456d29a07f26f21f7b93c84a93cbc
Merge "MRN-671 Rename and order templates in a human-readable way"