rename objects with contain . & cosmetic changes