[fix] - proper  place of variables, core => mwc typos