Added code to unregister names