Rename and clean up default template files