Added name registration fix