GrahamA: fix some names.