refactored naming conventions in core