Changed some names, makes a bit more sense.