Refactored naming conventions and integrating mappers and visitors.