Changed variable names to be consistent with JavaFX