Mir changed format
Make -by-id name more like the others