Update CommandQ for new naming conventions
Merge pull request #1557 from Cottser/commandq

Update CommandQ for new naming conventions