rename all the other places too