changed some variable names in Engine class