Any suggestions on what to do with the 6.1 - headings that just, well... SUCK!

I used to FOR YEARS and years, just hit shift H and typed in cur and it spelled </CURRENT MEDICATIONS/> 

Now with this 6.1 upgrade, it spells out </CURRENT ALLERGIES/> and I am messing up big time with reports.  THIS IS ASR WORK AND YOU ARE FLYING QUICKLY THROUGH THE REPORT.  On a lot of ASR reports, I have to add the headings in. 

I am so used to hitting CUR and expecting CURRENT MEDICATIONS which I have done for many years and quite frankly, I am not looking at the heading and screwing up when it posts current allergies, because I am expecting to be something else.  Also, when I hit  shift H and look for current medications, OF COURSE MQ MAKES IT DIFFICULT, I have to scroll down like 4 or 5 liines to get to CURRENT MEDICATIONS. 

This also goes the same for </PHYSICAL EXAMINATION/> which 6.1 types in </PHYS EXAM/>  and </SOCIAL/>  when I want it to state SOCIAL HISTORY.

It is just too confusing and I am messing up my reports because of this wonderful 6.1 we supposedly have now. 

Any helpful hints or ideas would be greatly appreciated.  I feel bad and care about my work and quality of my reports.  But it looks horrible in ASR when I have to add headings and I mess up.  Of course, I remember AFTER THE FACT when the report is already done and sent and of course we cannot go in and change it like used to many years ago. It is hard to break this habit of mine, especially when you have been doing this for 15 years. 

WHY, OH WHY, DID MQ HAVE TO GO AHEAD AND MESS UP THE HEADINGS.  How can I break this habit, yet not have me slow down to do it.

HOPE THIS ALL MAKES SENSE.  VERY TIRED.