Updated references to 'Usertype'