Changes names for less confusion