rename and cosmetic changes