Refactored naming.