Renamed CURRENT_APP_NAME to APPLICATION_ID :)