Modify command list for more accurate command names