Changed relevant weaver classes to fix #2366 by assuring they all use a common way to refer to types by their unique name.
Merge branch 'issue/2366' into develop