Change name of nested struct to avoid name clash with member function
Merge pull request #1225 from wmtan/RenameNestedStructToAvoidNameConflict

Threading fixes -- Change name of nested struct to avoid name clash with member function