some simplification / rename for consistency #46

Closed mmetc closed 1 year ago