Use code class for commands

Change-Id: Ia3fab9ba842b28aa6aa3baf6af40576ca0ad5f54
4 files changed