Rename & minor tweaks to get running