Remove double underscore for bouncer