Refactored naming conventions to a more intuitive scheme