Stop using deprecated PACKAGE_NAME in favour of the APPLICATION_ID