changing names and moving thing around