Refactored naming some more.