Rename MessageFormatter (and associated lines) with MessageFormat

Tests are still passing