rename query engine and cmd engine to be local
fix references