changing names for new SM - not tested