[ANALYZER-2259]Changing property names to plug into CCC's sort

architecture