Further work converting IDs, including removing name prefix