Macro v2 to convert old command names to current.