Changing language to use v2 terminology for M2X