various renames and added some new methods
Authored by: aliazzz 2020-01-02
Parent: [r54]
Child: [r56]