minor tweaks to functions names