Continuing rename of Options -> Common / AnyCommand -> Command