fix Boolean names and variable name