Rebuild and fix for camel case conflict in UserSerbice