Modified declaredXYZ() methods to use imports instead of fully qualified
names for lists and sets