Modify command names a bit