OC-1663: Replace references to app_name in code