Modifying command API to send the correct command names.