Renamed accessors
tmp dev script tweaks [ci skip]