FORGE-1733: Using the names provided by the CommandController