Revert main command names to singular