Rename canonicalParser map to be more obvious