Use literal command names. Fix missing import