Small fixes to builder--better naming system