changing names and removing unused object