Reworked command conventions.