Tech Debt: Clean up of names