naming convention and msm-common inclusions