Added B_PACKAGE_NAME