Rename the templates for the tag in a consistent maner
Changing the implementation with the new template names
Fix the templatetags tests
Merge branch 'feature/rename-templatetags-templates' into develop