Rename templates according to conventions
Rename templates according to conventions
Making coffee