Refactor Trait names for consistency