cleanup confusion between name and id

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | all
| Fixed tickets | #310

replaces #310 by fixing the naming the right way round.