Refactoring to include a hyphen/underscore in package name