Changed all 'BuilderId's to 'TypeId'