Revised style to remove typename from some of the macros
Revised style to remove typename from some of the macros

anl-tracc/polaris,anl-tracc/polaris,Symcies/polaris,anl-tracc/polaris,anl-tracc/polaris,Symcies/polaris,Symcies/polaris