Tweak sub-command group name.
Fix commands.py import after recent changes.