New substitutions as per http://xkcd.com/1418/