[magic] changed names for less confusion