more builder changes and renames