Better naming for less confusion