URGENT - inconsistent name components found in latest additions

The new "TenderEnvelopeID" as different qualifications in two uses:
  Tender Preparation. Tender_ Envelope Identifier. Identifier
  Tendered Project. Tender Envelope Identifier. Identifier

And the new "TenderEnvelopeTypeCode" has the same inconsistent qualifications:
  Tender Preparation. Tender_ Envelope Type Code. Code
  Tendered Project. Tender Envelope Type Code. Code