another name change and some minor tweaks