Name updates, build fixes