Fixed bugs in naming that I found deploying for engine.