fixed reversal of APP_NAME and PACKAGE