Removing legacy naming; minor code tweaks