changing names in SM - not tested
Merge remote-tracking branch 'upstream/master'
Merge pull request #67 from ffrensch/master

changing names for new SM - not tested