Issue #5: tweak postfix for commands