Cleanup pass. Names are more consistent and descriptive.