Simplify package name