Fix spots where it should have been referencing CustomUserAdmin and CustomUser.