Update naming convention
refactor templates, tests, and config