use the canonical names, add an instanceof test in MockMaker, and fix a bug