Move & cleanup name