Renaming "commands" to "cmds" in engine to avoid name conflicts

Change-Id: I287697978f7fe1870ccfdfceca1779461b9f6feb