Make IDs consistent