fullyQualifiedName: created a single entry template, rearranged code to match new hierarchy