Rename Register/Unregister functions