Rename proposed suborder builder->factory