[WIP] Minor changes to systembuilder to correct errors

Fixed some naming issues and added missing lines. Still does not pass tests.