Reworked command names and add aliases.