Update builder types to reflect upstream renames