TEIID-2959: Reverting SF matedata proeprties to original names