Removed some underscores from the attribute names, to ensure easy implementation. The dex looks really good,
Authored by: emlarsson 2021-02-08
Parent: [r6435]
Child: [r6437]