Gtaeway-3283:Fix Properties file having same names