command naming cleanup