Starting new template prefix branch
Move prefixing to method
Remove duplicate prefixing
Remove default prefix
Merge branch 'template-prefix' into develop