update names to make more sense