Remove static PACKAGE_NAME variable and refactor