Tech Debt: changing some tags