Remove underscore from package name