BMW M is making Competition trims the standard M trims, dropping the name