continuing to fix bugs from the name transfer