Edit subject not resolved

Hi Manisha,
I edited the subject as you advised in my previous ticket https://stackideas.com/forums/disable-state-edit-subject-cancel-membership to

COM_PP_NOTIFY_NEW_ORDER="New Order - [[INVOICE_CURRENCY]][[INVOICE_TOTAL]] [[CONFIG_COMPANY_NAME]]"

--> but the result is not 100% what I expected. There are 2 problems:

1) the subject of the email stayed the same. Only the heading in the body of the email got changed. Pl see attached img.

2) the [[CONFIG_COMPANY_NAME]] apparently doesn't stand for the buyer's company name, but OUR company name. I would like to change to it the user's company. Is it [[PREFERENCES_COMPANY_NAME]] or [[USER_COMPANY_NAME]]?

Thanks a lot for your help.