Update naming conventions for user admin