small tweaks in naming
merge