Fixed naming of Engine and EngineBuilder after merge with master