Resolved template tag naming conflicts