Fix: name
Fix: no namespace necessary
Enhancement: customize all the templates