Revert name stuff