MAGFest 8.5 Wording Changes

Closes #347 and #364.