Changed some of the naming terminology.