build fixups
rename