Updated for orgname/appname change in API