Move M2a back to its old description.
Update M8 and M8a_Test documentation.