Fix environment specific app name substitution