renamed global variables of engine
Merge branch 'engine_rebuild' into test-rebuild