gustafn
committed
on 29 Dec 22
make naming more consistent