Some naming cleanup.