do some more code unifications, catch more missing attrs
refactor and rename

no functional changes, regtest ran clean