Small refactors and renames.