Bugfix/fix naming scheme for sampling shorthand

Jadebeck, Johann Fredrikrequested to merge
bugfix/fix-naming-scheme-for-sampling-shorthand into develop

Merge request reports