Changed names to reflect proper terminology.