Changed some boolean variable names