Modified names to make more sense