Final go at renaming things for more consistency.