change names to be more consistent with list()