Enhancement of renaming abm stuff

[xsaschako]

Motivation / Current Behaviour

There were some things which needed revision but are since merged.

Enhancement description

Resolve enhancements

Additional context

No response

Checklist

• Attached labels, especially loc:: or model:: labels.
• Linked to project