Changed member variables' naming matching the naming convension