Refactored for package naming consistency