simulator: Make register identifers consistent