Property Link for title block text not displaying correctly on drawing sheet for part its relating to (?)

Hello All,

Recently upgraded to SW2016 and have an issue which I cannot figure out.  On SW2015, I would have say 12 different parts, then have each one detailed on a separate sheet all within the same drawing file.  One of my text property links in the title block on each sheet would refer to a custom property defined in the part (see shots below).  So I could have 12 different parts all detailed on 12 separate sheets within same file and have their part names listed in the title block.  With SW2016, something changed because all sheets have the sheet name in the lower right, NOT the custom property of the part itself.  I realize I can change the property link for the text but have tried many options and the help file is confusing to me and persists to show P215L for everything I try (I think its referring to the drawing file which is also called P215L). Any suggestions are much appreciated.  Thanks in advance.....

p.s. using P257L part for example on the sheet, but it still shows P215L in the title block even though I have the custom property "drawing" set for P257L and the property link for the text on the sheet shows P215L

SolidworksDrawings And Detailing