Working templates not definitive
Name refactoring
bugfix
Cleanup