diff --git a/productMods/WEB-INF/ontologies/update/diff.tab.txt b/productMods/WEB-INF/ontologies/update/diff.tab.txt
index f48e8d75..f1500ecb 100644
--- a/productMods/WEB-INF/ontologies/update/diff.tab.txt
+++ b/productMods/WEB-INF/ontologies/update/diff.tab.txt
@@ -1 +1 @@
-http://purl.org/NET/c4dm/event.owl#agent			Delete	z
http://purl.org/NET/c4dm/event.owl#isAgentIn			Delete	z
http://purl.org/NET/c4dm/event.owl#produced_in	http://purl.obolibrary.org/obo/RO_0002353	Yes		z
http://purl.org/NET/c4dm/event.owl#product	http://purl.obolibrary.org/obo/RO_0002234	Yes		z
http://purl.org/dc/elements/1.1/isVersionOf			Delete	z
http://vivoweb.org/ontology/core#administeredBy			Delete	complex construct with grant administrator role
http://purl.org/dc/terms/contributor			Delete	z
http://purl.org/dc/terms/isReferencedBy			Delete	z
http://purl.org/dc/terms/isVersionOf			Delete	z
http://purl.org/dc/terms/publisher	http://vivoweb.org/ontology/core#publisher	Yes		z
http://purl.org/ontology/bibo/editor			Delete	z
http://vivoweb.org/ontology/core#administers			Delete	complex construct with grant administrator role
http://vivoweb.org/ontology/core#advisee			Delete	CC - advising relationship plus add advisee role
http://vivoweb.org/ontology/core#adviseeIn			Delete	CC - advising relationship plus add advisee role
http://vivoweb.org/ontology/core#advisingContributionTo			Delete	construct
http://vivoweb.org/ontology/core#advisor			Delete	CC - advising relationship plus add advisor role
http://vivoweb.org/ontology/core#advisorIn			Delete	CC - advising relationship plus add advisor role
http://vivoweb.org/ontology/core#associatedRole	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#associatedWithPosition	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#attendeeRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#authorInAuthorship	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#awardConferred	http://vivoweb.org/ontology/core#assigns	Yes		z
http://vivoweb.org/ontology/core#awardConferredBy	http://vivoweb.org/ontology/core#assignedBy	Yes		z
http://vivoweb.org/ontology/core#awardOrHonor	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#awardOrHonorFor	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#awardsGrant	http://vivoweb.org/ontology/core#assigns	Yes		z
http://vivoweb.org/ontology/core#clinicalRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#co-PrincipalInvestigatorRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#courseOfferedBy	http://vivoweb.org/ontology/core#offeredBy	Yes		z
http://vivoweb.org/ontology/core#credentialOf	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#currentMemberOf			Delete	construct MemberRole
http://vivoweb.org/ontology/core#currentlyHeadOf			Delete	construct LeaderRole
http://vivoweb.org/ontology/core#currentlyHeadedBy			Delete	construct LeaderRole
http://vivoweb.org/ontology/core#degreeEarned	http://purl.obolibrary.org/obo/RO_0002234	Yes		z
http://vivoweb.org/ontology/core#degreeOfferedBy	http://vivoweb.org/ontology/core#offeredBy	Yes		z
http://vivoweb.org/ontology/core#degreeOutcomeOf	http://purl.obolibrary.org/obo/RO_0002353	Yes		z
http://vivoweb.org/ontology/core#domesticGeographicFocus	http://vivoweb.org/ontology/core#geographicFocus	Yes		z
http://vivoweb.org/ontology/core#domesticGeographicFocusOf	http://vivoweb.org/ontology/core#geographicFocusOf	Yes		z
http://vivoweb.org/ontology/core#editor			Delete	CC editorship
http://vivoweb.org/ontology/core#editorOf			Delete	CC editorship
http://vivoweb.org/ontology/core#editorRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#educationalTraining	http://purl.obolibrary.org/obo/RO_0000056	Yes		z
http://vivoweb.org/ontology/core#educationalTrainingOf	http://purl.obolibrary.org/obo/RO_0000057	Yes		z
http://vivoweb.org/ontology/core#equipmentInFacility	http://purl.obolibrary.org/obo/RO_0001025	Yes		"""located in"""
http://vivoweb.org/ontology/core#eventWithin	http://purl.obolibrary.org/obo/BFO_0000050	Yes		"""part of"""
http://vivoweb.org/ontology/core#geographicLocationOf	http://purl.obolibrary.org/obo/RO_0001015	Yes		"""location of"""
http://vivoweb.org/ontology/core#geographicallyContains	http://purl.obolibrary.org/obo/BFO_0000051	Yes		"""has part"""
http://vivoweb.org/ontology/core#geographicallyWithin	http://purl.obolibrary.org/obo/BFO_0000050	Yes		z
http://vivoweb.org/ontology/core#grantAwardedBy	http://vivoweb.org/ontology/core#assignedBy	Yes		z
http://vivoweb.org/ontology/core#hasAttendeeRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasAttendeeRoleContext
http://vivoweb.org/ontology/core#hasClinicalRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasClinicalRoleContext
http://vivoweb.org/ontology/core#hasCo-PrincipalInvestigatorRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasCo-PrincipalInvestigatorRoleContext
http://vivoweb.org/ontology/core#hasCredential	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#hasCurrentMember			Delete	construct MemberRole
http://vivoweb.org/ontology/core#hasEditorRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasEditorRoleContext
http://vivoweb.org/ontology/core#hasGeographicLocation	http://purl.obolibrary.org/obo/RO_0001025	Yes		"""located in"""
http://vivoweb.org/ontology/core#hasInvestigatorRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasInvestigatorRoleContext
http://vivoweb.org/ontology/core#hasLeaderRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasLeaderRoleContext
http://vivoweb.org/ontology/core#hasMemberRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasMemberRoleContext
http://vivoweb.org/ontology/core#hasOrganizerRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasOrganizerRoleContext
http://vivoweb.org/ontology/core#hasOutreachProviderRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasOutreachProviderContext
http://vivoweb.org/ontology/core#hasPart	http://purl.obolibrary.org/obo/BFO_0000051	Yes		z
http://vivoweb.org/ontology/core#hasPresenterRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasPresenterRoleContext
http://vivoweb.org/ontology/core#hasPrincipalInvestigatorRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasPrincipalInvestigatorRoleContext
http://vivoweb.org/ontology/core#hasResearcherRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasResearcherRoleContext
http://vivoweb.org/ontology/core#hasReviewerRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasReviewerRoleContext
http://vivoweb.org/ontology/core#hasRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		z
http://vivoweb.org/ontology/core#hasRoom	http://purl.obolibrary.org/obo/BFO_0000051	Yes		"""has part"""
http://vivoweb.org/ontology/core#hasServiceProviderRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasServiceProviderRoleContext
http://vivoweb.org/ontology/core#hasSubGrant	http://purl.obolibrary.org/obo/BFO_0000051	Yes		z
http://vivoweb.org/ontology/core#hasSubOrganization	http://purl.obolibrary.org/obo/BFO_0000051	Yes		z
http://vivoweb.org/ontology/core#hasTeacherRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		z
http://vivoweb.org/ontology/core#inEventSeries	http://purl.obolibrary.org/obo/BFO_0000050	Yes		"""part of"""
http://vivoweb.org/ontology/core#includesEvent	http://purl.obolibrary.org/obo/BFO_0000051	Yes		z
http://vivoweb.org/ontology/core#informationProduct	http://purl.obolibrary.org/obo/RO_0002234	Yes		z
http://vivoweb.org/ontology/core#informationProductOf	http://purl.obolibrary.org/obo/RO_0002353	Yes		z
http://vivoweb.org/ontology/core#informationResourceInAuthorship	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#internationalGeographicFocus	http://vivoweb.org/ontology/core#geographicFocus	Yes		z
http://vivoweb.org/ontology/core#internationalGeographicFocusOf	http://vivoweb.org/ontology/core#geographicFocusOf	Yes		z
http://vivoweb.org/ontology/core#investigatorRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		"""inheres in"""
http://vivoweb.org/ontology/core#issuanceOfCredential	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#issuedCredential	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#leaderRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#linkedAuthor	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#linkedInformationResource	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#locationOfEquipment	http://purl.obolibrary.org/obo/RO_0001015	Yes		z
http://vivoweb.org/ontology/core#mailingAddress			Delete	VCard
http://vivoweb.org/ontology/core#mailingAddressFor			Delete	VCard
http://vivoweb.org/ontology/core#memberRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#offersCourse	http://vivoweb.org/ontology/core#offers	Yes		z
http://vivoweb.org/ontology/core#offersDegree	http://vivoweb.org/ontology/core#offers	Yes		z
http://vivoweb.org/ontology/core#organizationForPosition	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#organizationForTraining	http://purl.obolibrary.org/obo/RO_0000056	Yes		z
http://vivoweb.org/ontology/core#organizerRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#outcome	http://purl.obolibrary.org/obo/RO_0002234	Yes		z
http://vivoweb.org/ontology/core#outcomeOf	http://purl.obolibrary.org/obo/RO_0002353	Yes		z
http://vivoweb.org/ontology/core#outreachProviderRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#partOf	http://purl.obolibrary.org/obo/BFO_0000050	Yes		z
http://vivoweb.org/ontology/core#personInPosition	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#positionForPerson	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#positionInOrganization	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#presenterRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#principalInvestigatorRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#providesService	http://vivoweb.org/ontology/core#offers	Yes		z
http://vivoweb.org/ontology/core#realizedRole	http://purl.obolibrary.org/obo/BFO_0000055	Yes		"""realizes"""
http://vivoweb.org/ontology/core#receipt	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#receiptOf	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#relatedRole	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#researcherRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#reviewerRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#roleIn	http://purl.obolibrary.org/obo/BFO_0000054	Yes		"""realized in"" (or delete, since there should be subs?)"
http://vivoweb.org/ontology/core#roleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#roleRealizedIn	http://purl.obolibrary.org/obo/BFO_0000054	Yes		z
http://vivoweb.org/ontology/core#roomWithinBuilding	http://purl.obolibrary.org/obo/RO_0001025	Yes		z
http://vivoweb.org/ontology/core#seriesForEvent	http://purl.obolibrary.org/obo/BFO_0000051	Yes		z
http://vivoweb.org/ontology/core#serviceProvidedBy	http://vivoweb.org/ontology/core#offeredBy	Yes		z
http://vivoweb.org/ontology/core#serviceProviderRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#subGrantOf	http://purl.obolibrary.org/obo/BFO_0000050	Yes		z
http://vivoweb.org/ontology/core#subOrganizationWithin	http://purl.obolibrary.org/obo/BFO_0000050	Yes		z
http://vivoweb.org/ontology/core#teacherRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#trainingAtOrganization	http://purl.obolibrary.org/obo/RO_0000057	Yes		z
http://vivoweb.org/ontology/core#authorRank	http://vivoweb.org/ontology/core#rank	Yes		z
http://vivoweb.org/ontology/core#preferredTitle			Delete	z
http://vivoweb.org/ontology/core#EducationalTraining	http://vivoweb.org/ontology/core#EducationalProcess	Yes		z
http://vivoweb.org/ontology/core#ServiceProviderRole	http://purl.obolibrary.org/obo/ERO_0000012	Yes		z
http://vivoweb.org/ontology/core#URLLink	http://www.w3.org/2006/vcard/ns#URL	Yes		z
http://vivoweb.org/ontology/core#Agreement			Delete	z
http://vivoweb.org/ontology/core#InformationResource	http://purl.obolibrary.org/obo/IAO_0000030	Yes		z
http://vivoweb.org/ontology/core#Service			Delete	z
http://vivoweb.org/ontology/core#Software	http://purl.obolibrary.org/obo/ERO_0000071	Yes		z
\ No newline at end of file
+http://purl.org/NET/c4dm/event.owl#agent			Delete	z
http://purl.org/NET/c4dm/event.owl#isAgentIn			Delete	z
http://purl.org/NET/c4dm/event.owl#produced_in	http://purl.obolibrary.org/obo/RO_0002353	Yes		z
http://purl.org/NET/c4dm/event.owl#product	http://purl.obolibrary.org/obo/RO_0002234	Yes		z
http://purl.org/dc/elements/1.1/isVersionOf			Delete	z
http://vivoweb.org/ontology/core#administeredBy			Delete	complex construct with grant administrator role
http://purl.org/dc/terms/isReferencedBy			Delete	z
http://purl.org/dc/terms/isVersionOf			Delete	z
http://purl.org/dc/terms/publisher	http://vivoweb.org/ontology/core#publisher	Yes		z
http://purl.org/ontology/bibo/editor			Delete	z
http://vivoweb.org/ontology/core#administers			Delete	complex construct with grant administrator role
http://vivoweb.org/ontology/core#advisee			Delete	CC - advising relationship plus add advisee role
http://vivoweb.org/ontology/core#adviseeIn			Delete	CC - advising relationship plus add advisee role
http://vivoweb.org/ontology/core#advisingContributionTo			Delete	construct
http://vivoweb.org/ontology/core#advisor			Delete	CC - advising relationship plus add advisor role
http://vivoweb.org/ontology/core#advisorIn			Delete	CC - advising relationship plus add advisor role
http://vivoweb.org/ontology/core#associatedRole	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#associatedWithPosition	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#attendeeRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#authorInAuthorship	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#awardConferred	http://vivoweb.org/ontology/core#assigns	Yes		z
http://vivoweb.org/ontology/core#awardConferredBy	http://vivoweb.org/ontology/core#assignedBy	Yes		z
http://vivoweb.org/ontology/core#awardOrHonor	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#awardOrHonorFor	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#awardsGrant	http://vivoweb.org/ontology/core#assigns	Yes		z
http://vivoweb.org/ontology/core#clinicalRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#co-PrincipalInvestigatorRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#courseOfferedBy	http://vivoweb.org/ontology/core#offeredBy	Yes		z
http://vivoweb.org/ontology/core#credentialOf	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#currentMemberOf			Delete	construct MemberRole
http://vivoweb.org/ontology/core#currentlyHeadOf			Delete	construct LeaderRole
http://vivoweb.org/ontology/core#currentlyHeadedBy			Delete	construct LeaderRole
http://vivoweb.org/ontology/core#degreeEarned	http://purl.obolibrary.org/obo/RO_0002234	Yes		z
http://vivoweb.org/ontology/core#degreeOfferedBy	http://vivoweb.org/ontology/core#offeredBy	Yes		z
http://vivoweb.org/ontology/core#degreeOutcomeOf	http://purl.obolibrary.org/obo/RO_0002353	Yes		z
http://vivoweb.org/ontology/core#domesticGeographicFocus	http://vivoweb.org/ontology/core#geographicFocus	Yes		z
http://vivoweb.org/ontology/core#domesticGeographicFocusOf	http://vivoweb.org/ontology/core#geographicFocusOf	Yes		z
http://vivoweb.org/ontology/core#editor			Delete	CC editorship
http://vivoweb.org/ontology/core#editorOf			Delete	CC editorship
http://vivoweb.org/ontology/core#editorRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#educationalTraining	http://purl.obolibrary.org/obo/RO_0000056	Yes		z
http://vivoweb.org/ontology/core#educationalTrainingOf	http://purl.obolibrary.org/obo/RO_0000057	Yes		z
http://vivoweb.org/ontology/core#equipmentInFacility	http://purl.obolibrary.org/obo/RO_0001025	Yes		"""located in"""
http://vivoweb.org/ontology/core#eventWithin	http://purl.obolibrary.org/obo/BFO_0000050	Yes		"""part of"""
http://vivoweb.org/ontology/core#geographicLocationOf	http://purl.obolibrary.org/obo/RO_0001015	Yes		"""location of"""
http://vivoweb.org/ontology/core#geographicallyContains	http://purl.obolibrary.org/obo/BFO_0000051	Yes		"""has part"""
http://vivoweb.org/ontology/core#geographicallyWithin	http://purl.obolibrary.org/obo/BFO_0000050	Yes		z
http://vivoweb.org/ontology/core#grantAwardedBy	http://vivoweb.org/ontology/core#assignedBy	Yes		z
http://vivoweb.org/ontology/core#hasAttendeeRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasAttendeeRoleContext
http://vivoweb.org/ontology/core#hasClinicalRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasClinicalRoleContext
http://vivoweb.org/ontology/core#hasCo-PrincipalInvestigatorRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasCo-PrincipalInvestigatorRoleContext
http://vivoweb.org/ontology/core#hasCredential	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#hasCurrentMember			Delete	construct MemberRole
http://vivoweb.org/ontology/core#hasEditorRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasEditorRoleContext
http://vivoweb.org/ontology/core#hasGeographicLocation	http://purl.obolibrary.org/obo/RO_0001025	Yes		"""located in"""
http://vivoweb.org/ontology/core#hasInvestigatorRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasInvestigatorRoleContext
http://vivoweb.org/ontology/core#hasLeaderRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasLeaderRoleContext
http://vivoweb.org/ontology/core#hasMemberRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasMemberRoleContext
http://vivoweb.org/ontology/core#hasOrganizerRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasOrganizerRoleContext
http://vivoweb.org/ontology/core#hasOutreachProviderRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasOutreachProviderContext
http://vivoweb.org/ontology/core#hasPart	http://purl.obolibrary.org/obo/BFO_0000051	Yes		z
http://vivoweb.org/ontology/core#hasPresenterRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasPresenterRoleContext
http://vivoweb.org/ontology/core#hasPrincipalInvestigatorRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasPrincipalInvestigatorRoleContext
http://vivoweb.org/ontology/core#hasResearcherRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasResearcherRoleContext
http://vivoweb.org/ontology/core#hasReviewerRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasReviewerRoleContext
http://vivoweb.org/ontology/core#hasRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		z
http://vivoweb.org/ontology/core#hasRoom	http://purl.obolibrary.org/obo/BFO_0000051	Yes		"""has part"""
http://vivoweb.org/ontology/core#hasServiceProviderRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		cc:hasServiceProviderRoleContext
http://vivoweb.org/ontology/core#hasSubGrant	http://purl.obolibrary.org/obo/BFO_0000051	Yes		z
http://vivoweb.org/ontology/core#hasSubOrganization	http://purl.obolibrary.org/obo/BFO_0000051	Yes		z
http://vivoweb.org/ontology/core#hasTeacherRole	http://purl.obolibrary.org/obo/RO_0000053	Yes		z
http://vivoweb.org/ontology/core#inEventSeries	http://purl.obolibrary.org/obo/BFO_0000050	Yes		"""part of"""
http://vivoweb.org/ontology/core#includesEvent	http://purl.obolibrary.org/obo/BFO_0000051	Yes		z
http://vivoweb.org/ontology/core#informationProduct	http://purl.obolibrary.org/obo/RO_0002234	Yes		z
http://vivoweb.org/ontology/core#informationProductOf	http://purl.obolibrary.org/obo/RO_0002353	Yes		z
http://vivoweb.org/ontology/core#informationResourceInAuthorship	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#internationalGeographicFocus	http://vivoweb.org/ontology/core#geographicFocus	Yes		z
http://vivoweb.org/ontology/core#internationalGeographicFocusOf	http://vivoweb.org/ontology/core#geographicFocusOf	Yes		z
http://vivoweb.org/ontology/core#investigatorRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		"""inheres in"""
http://vivoweb.org/ontology/core#issuanceOfCredential	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#issuedCredential	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#leaderRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#linkedAuthor	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#linkedInformationResource	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#locationOfEquipment	http://purl.obolibrary.org/obo/RO_0001015	Yes		z
http://vivoweb.org/ontology/core#mailingAddress			Delete	VCard
http://vivoweb.org/ontology/core#mailingAddressFor			Delete	VCard
http://vivoweb.org/ontology/core#memberRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#offersCourse	http://vivoweb.org/ontology/core#offers	Yes		z
http://vivoweb.org/ontology/core#offersDegree	http://vivoweb.org/ontology/core#offers	Yes		z
http://vivoweb.org/ontology/core#organizationForPosition	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#organizationForTraining	http://purl.obolibrary.org/obo/RO_0000056	Yes		z
http://vivoweb.org/ontology/core#organizerRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#outcome	http://purl.obolibrary.org/obo/RO_0002234	Yes		z
http://vivoweb.org/ontology/core#outcomeOf	http://purl.obolibrary.org/obo/RO_0002353	Yes		z
http://vivoweb.org/ontology/core#outreachProviderRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#partOf	http://purl.obolibrary.org/obo/BFO_0000050	Yes		z
http://vivoweb.org/ontology/core#personInPosition	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#positionForPerson	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#positionInOrganization	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#presenterRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#principalInvestigatorRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#providesService	http://vivoweb.org/ontology/core#offers	Yes		z
http://vivoweb.org/ontology/core#realizedRole	http://purl.obolibrary.org/obo/BFO_0000055	Yes		"""realizes"""
http://vivoweb.org/ontology/core#receipt	http://vivoweb.org/ontology/core#relatedBy	Yes		z
http://vivoweb.org/ontology/core#receiptOf	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#relatedRole	http://vivoweb.org/ontology/core#relates	Yes		z
http://vivoweb.org/ontology/core#researcherRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#reviewerRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#roleIn	http://purl.obolibrary.org/obo/BFO_0000054	Yes		"""realized in"" (or delete, since there should be subs?)"
http://vivoweb.org/ontology/core#roleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#roleRealizedIn	http://purl.obolibrary.org/obo/BFO_0000054	Yes		z
http://vivoweb.org/ontology/core#roomWithinBuilding	http://purl.obolibrary.org/obo/RO_0001025	Yes		z
http://vivoweb.org/ontology/core#seriesForEvent	http://purl.obolibrary.org/obo/BFO_0000051	Yes		z
http://vivoweb.org/ontology/core#serviceProvidedBy	http://vivoweb.org/ontology/core#offeredBy	Yes		z
http://vivoweb.org/ontology/core#serviceProviderRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#subGrantOf	http://purl.obolibrary.org/obo/BFO_0000050	Yes		z
http://vivoweb.org/ontology/core#subOrganizationWithin	http://purl.obolibrary.org/obo/BFO_0000050	Yes		z
http://vivoweb.org/ontology/core#teacherRoleOf	http://purl.obolibrary.org/obo/RO_0000052	Yes		z
http://vivoweb.org/ontology/core#trainingAtOrganization	http://purl.obolibrary.org/obo/RO_0000057	Yes		z
http://vivoweb.org/ontology/core#authorRank	http://vivoweb.org/ontology/core#rank	Yes		z
http://vivoweb.org/ontology/core#preferredTitle			Delete	z
http://vivoweb.org/ontology/core#EducationalTraining	http://vivoweb.org/ontology/core#EducationalProcess	Yes		z
http://vivoweb.org/ontology/core#ServiceProviderRole	http://purl.obolibrary.org/obo/ERO_0000012	Yes		z
http://vivoweb.org/ontology/core#URLLink	http://www.w3.org/2006/vcard/ns#URL	Yes		z
http://vivoweb.org/ontology/core#Agreement			Delete	z
http://vivoweb.org/ontology/core#InformationResource	http://purl.obolibrary.org/obo/IAO_0000030	Yes		z
http://vivoweb.org/ontology/core#Service			Delete	z
http://vivoweb.org/ontology/core#Software	http://purl.obolibrary.org/obo/ERO_0000071	Yes		z
\ No newline at end of file
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl
index ce7ddb2a..711d2ee7 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl
@@ -19,7 +19,7 @@
             <a href="${profileUrl(statement.uri("person"))}" title="${i18n().person_name}">${statement.personName}</a>
         <#else>
             <#-- This shouldn't happen, but we must provide for it -->
-            <a href="${profileUrl(statement.uri("training"))}" title="${i18n().missing_person_in_posn}">${i18n().missing_person_in_posn}</a>
+            <a href="${profileUrl(statement.uri("edTraining"))}" title="${i18n().missing_person_in_posn}">${i18n().missing_person_in_posn}</a>
         </#if>
     </#local>
     <#local detailedInfo>
diff --git a/rdf/tbox/filegraph/classes-additional.owl b/rdf/tbox/filegraph/classes-additional.owl
index 4e57d6f7..ebe04e37 100644
--- a/rdf/tbox/filegraph/classes-additional.owl
+++ b/rdf/tbox/filegraph/classes-additional.owl
@@ -773,7 +773,7 @@
     
 
 
-    <!-- http://vivoweb.org/ontology/core#EducationalTraining -->
+    <!-- http://vivoweb.org/ontology/core#EducationalProcess -->
 
     <owl:Class rdf:about="http://vivoweb.org/ontology/core#EducationalProcess">
 
@@ -955,7 +955,7 @@
         <rdfs:subClassOf>
             <owl:Restriction>
                 <owl:onProperty rdf:resource="http://vivoweb.org/ontology/core#offers"/>
-                <owl:someValuesFrom rdf:resource="http://vivoweb.org/ontology/core#Service"/>
+                <owl:someValuesFrom rdf:resource="http://purl.obolibrary.org/obo/ERO_0000005"/>
             </owl:Restriction>
         </rdfs:subClassOf>
     </owl:Class>
diff --git a/rdf/tbox/filegraph/object-properties.owl b/rdf/tbox/filegraph/object-properties.owl
index 176c40e7..4c95312e 100644
--- a/rdf/tbox/filegraph/object-properties.owl
+++ b/rdf/tbox/filegraph/object-properties.owl
@@ -698,7 +698,6 @@
         <rdfs:range rdf:resource="http://purl.obolibrary.org/obo/ERO_0000015"/>
         <owl:inverseOf rdf:resource="http://purl.obolibrary.org/obo/ERO_0001521"/>
         <obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
-        <rdfs:subPropertyOf rdf:resource="http://purl.org/NET/c4dm/event.owl#isAgentIn"/>
         <rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Organization"/>
     </owl:ObjectProperty>
     
@@ -1145,22 +1144,6 @@ there is a measurement process p that has specified output m, a measurement datu
     
 
 
-    <!-- http://purl.org/NET/c4dm/event.owl#isAgentIn -->
-
-    <owl:ObjectProperty rdf:about="http://purl.org/NET/c4dm/event.owl#isAgentIn">
-
-        <rdfs:range rdf:resource="http://purl.org/NET/c4dm/event.owl#Event"/>
-     <!--   <rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Agent"/>  -->
-    </owl:ObjectProperty>
-    
-
-
-    <!-- http://purl.org/dc/terms/relation -->
-
-    <owl:ObjectProperty rdf:about="http://purl.org/dc/terms/relation"/>
-    
-
-
 
 
     <!-- http://purl.org/ontology/bibo/affirmedBy -->
@@ -1508,14 +1491,6 @@ there is a measurement process p that has specified output m, a measurement datu
     
 
 
-    <!-- http://vivoweb.org/ontology/core#geographicLocationOf -->
-
-    <owl:ObjectProperty rdf:about="http://vivoweb.org/ontology/core#geographicLocationOf">
-
-    </owl:ObjectProperty>
-    
-
-
     <!-- http://vivoweb.org/ontology/core#grantSubcontractedThrough -->
 
     <owl:ObjectProperty rdf:about="http://vivoweb.org/ontology/core#grantSubcontractedThrough">
@@ -1534,15 +1509,6 @@ there is a measurement process p that has specified output m, a measurement datu
     
 
 
-    <!-- http://vivoweb.org/ontology/core#hasGeographicLocation -->
-
-    <owl:ObjectProperty rdf:about="http://vivoweb.org/ontology/core#hasGeographicLocation">
-
-        <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Currently being used by a restriction on organization.</obo:IAO_0000112>
-        <rdfs:range rdf:resource="http://vivoweb.org/ontology/core#GeographicLocation"/>
-    </owl:ObjectProperty>
-    
-
 
     <!-- http://vivoweb.org/ontology/core#hasPrerequisite -->
 
diff --git a/rdf/tbox/filegraph/objectDomains.rdf b/rdf/tbox/filegraph/objectDomains.rdf
index cec51c19..d50bbf34 100644
--- a/rdf/tbox/filegraph/objectDomains.rdf
+++ b/rdf/tbox/filegraph/objectDomains.rdf
@@ -29,9 +29,6 @@
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#translatorOf">
     <rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Agent"/>
   </rdf:Description>
-  <rdf:Description rdf:about="http://vivoweb.org/ontology/core#geographicLocationOf">
-    <rdfs:domain rdf:resource="http://vivoweb.org/ontology/core#GeographicLocation"/>
-  </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasSuccessorOrganization">
     <rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Organization"/>
   </rdf:Description>
diff --git a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 b/rdf/tbox/firsttime/initialTBoxAnnotations.n3
index 1f0823bf..b41d98c9 100644
--- a/rdf/tbox/firsttime/initialTBoxAnnotations.n3
+++ b/rdf/tbox/firsttime/initialTBoxAnnotations.n3
@@ -827,23 +827,6 @@ vivo:AttendeeRole
       vitro:prohibitedFromUpdateBelowRoleLevelAnnot
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> .
 
-vivo:geographicLocationOf
-      rdfs:label "geographic location of"@en-US ;
-      vitro:displayLimitAnnot
-              "5"^^xsd:int ;
-      vitro:displayRankAnnot
-              "60"^^xsd:int ;
-      vitro:fullPropertyNameAnnot
-              "nearestGeographicLocationFor"^^xsd:string ;
-      vitro:hiddenFromDisplayBelowRoleLevelAnnot
-              <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
-      vitro:prohibitedFromUpdateBelowRoleLevelAnnot
-              <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
-      vitro:publicDescriptionAnnot
-              """This relates a geographic location to something within that geographic location, for example, an organization within that geographic location.
-"""^^xsd:string ;
-      vitro:selectFromExistingAnnot
-              "true"^^xsd:boolean .
 
 vivo:invited
       rdfs:label "invited"@en-US .
@@ -3631,25 +3614,6 @@ vivo:WorkshopSeries
       vitro:prohibitedFromUpdateBelowRoleLevelAnnot
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> .
 
-event:isAgentIn
-      rdfs:label "is agent in"@en-US ;
-      vitro:displayLimitAnnot
-              "5"^^xsd:int ;
-      vitro:fullPropertyNameAnnot
-              "isAgentIn"^^xsd:string ;
-      vitro:hiddenFromDisplayBelowRoleLevelAnnot
-              <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ;
-      vitro:inPropertyGroupAnnot
-              <http://vivoweb.org/ontology#vitroPropertyGroupmapping> ;
-      vitro:offerCreateNewOptionAnnot
-              "true"^^xsd:boolean ;
-      vitro:prohibitedFromUpdateBelowRoleLevelAnnot
-              <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ;
-      vitro:publicDescriptionAnnot
-              "This relates an active agent to an event."^^xsd:string ;
-      vitro:selectFromExistingAnnot
-              "true"^^xsd:boolean .
-
 obo:ERO_0000225
       rdfs:label "Educator Role"@en-US .
 
@@ -6097,23 +6061,6 @@ geo:populationNotes
       vitro:prohibitedFromUpdateBelowRoleLevelAnnot
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> .
 
-vivo:currentMemberOf
-      rdfs:label "current member of"@en-US ;
-      vitro:fullPropertyNameAnnot
-              "member of"^^xsd:string ;
-      vitro:hiddenFromDisplayBelowRoleLevelAnnot
-              <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ;
-      vitro:inPropertyGroupAnnot
-              <http://vivoweb.org/ontology#vitroPropertyGroupaffiliation> ;
-      vitro:offerCreateNewOptionAnnot
-              "true"^^xsd:boolean ;
-      vitro:prohibitedFromUpdateBelowRoleLevelAnnot
-              <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ;
-      vitro:publicDescriptionAnnot
-              "A person's formal or informal affiliation with a group."^^xsd:string ;
-      vitro:selectFromExistingAnnot
-              "true"^^xsd:boolean .
-
 vivo:Campus
       rdfs:label "Campus"@en-US ;
       vitro:displayLimitAnnot
@@ -6747,28 +6694,6 @@ geo:landAreaUnit
       vitro:prohibitedFromUpdateBelowRoleLevelAnnot
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> .
 
-vivo:hasGeographicLocation
-      rdfs:label "has geographic location"@en-US ;
-      vitro:displayLimitAnnot
-              "5"^^xsd:int ;
-      vitro:displayRankAnnot
-              "60"^^xsd:int ;
-      vitro:fullPropertyNameAnnot
-              "nearestGeographicLocation"^^xsd:string ;
-      vitro:hiddenFromDisplayBelowRoleLevelAnnot
-              <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
-      vitro:inPropertyGroupAnnot
-              <http://vivoweb.org/ontology#vitroPropertyGrouplocation> ;
-      vitro:offerCreateNewOptionAnnot
-              "true"^^xsd:boolean ;
-      vitro:prohibitedFromUpdateBelowRoleLevelAnnot
-              <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
-      vitro:publicDescriptionAnnot
-              """This relates something to its geographic location, for example, an organization to its geographic location. 
-"""^^xsd:string ;
-      vitro:selectFromExistingAnnot
-              "true"^^xsd:boolean .
-
 vcard:hasSound
       rdfs:label "has sound"@en-US .
 
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationForTrainingGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationForTrainingGenerator.java
index 1d8abae7..c7070d8b 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationForTrainingGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationForTrainingGenerator.java
@@ -42,7 +42,8 @@ public class OrganizationForTrainingGenerator  extends VivoBaseGenerator impleme
                 
         conf.setN3Required( Arrays.asList( n3ForNewEdTraining, trainingTypeAssertion ) );
         conf.setN3Optional(Arrays.asList( majorFieldAssertion,  n3ForAwardedDegree, n3ForNewPerson, n3ForExistingPerson,
-                n3ForNewPersonAwardedDegree, n3ForExistingPersonAwardedDegree, deptAssertion, infoAssertion, n3ForStart, n3ForEnd ));
+                n3ForNewPersonAwardedDegree, n3ForExistingPersonAwardedDegree, deptAssertion, infoAssertion, n3ForStart, 
+                n3ForEnd, firstNameAssertion, lastNameAssertion ));
         
         conf.addNewResource("edTraining", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("awardedDegree",DEFAULT_NS_FOR_NEW_RESOURCE);
@@ -56,7 +57,7 @@ public class OrganizationForTrainingGenerator  extends VivoBaseGenerator impleme
         //uris in scope: none   
         //literals in scope: none
         
-        conf.setUrisOnform( Arrays.asList( "existingPerson", "personType", "degreeType", "trainingType"));
+        conf.setUrisOnform( Arrays.asList( "existingPerson", "degreeType", "trainingType"));
         conf.setLiteralsOnForm( Arrays.asList("personLabel", "personLabelDisplay", "awardedDegreeLabel",
                                               "majorField", "dept", "info", "firstName", "lastName"));
 
@@ -70,7 +71,6 @@ public class OrganizationForTrainingGenerator  extends VivoBaseGenerator impleme
         
         conf.addSparqlForExistingUris("awardedDegree", existingAwardedDegreeQuery);
         conf.addSparqlForExistingUris("existingPerson", existingPersonQuery);
-//        conf.addSparqlForExistingUris("personType", personTypeQuery);
         conf.addSparqlForExistingUris("trainingType", trainingTypeQuery);
         conf.addSparqlForExistingUris("degreeType", degreeTypeQuery);
         conf.addSparqlForExistingUris("intervalNode",existingIntervalNodeQuery);
@@ -177,38 +177,38 @@ public class OrganizationForTrainingGenerator  extends VivoBaseGenerator impleme
     
     final static String n3ForNewEdTraining =       
         "@prefix core: <"+ vivoCore +"> .\n"+
-        "?organization <http://purl.obolibrary.person/obo/RO_0000056>  ?edTraining .\n" +
+        "?organization <http://purl.obolibrary.org/obo/RO_0000056>  ?edTraining .\n" +
         "?edTraining  a core:EducationalProcess .\n" +
-        "?edTraining <http://purl.obolibrary.person/obo/RO_0000057> ?organization .";
+        "?edTraining <http://purl.obolibrary.org/obo/RO_0000057> ?organization .";
 
     final static String trainingTypeAssertion =
         "?edTraining a ?trainingType .";
 
     final static String n3ForAwardedDegree  =      
         "@prefix core: <"+ vivoCore +"> .\n"+
-        "?edTraining <http://purl.obolibrary.person/obo/RO_0002234> ?awardedDegree . \n" +
-        "?awardedDegree <http://purl.obolibrary.person/obo/RO_0002353> ?edTraining . \n" +
-        "?awardedDegree <http://vivoweb.person/ontology/core#assignedBy> ?organization . \n" +
-        "?organization <http://vivoweb.person/ontology/core#assigns> ?awardedDegree . \n" +
+        "?edTraining <http://purl.obolibrary.org/obo/RO_0002234> ?awardedDegree . \n" +
+        "?awardedDegree <http://purl.obolibrary.org/obo/RO_0002353> ?edTraining . \n" +
+        "?awardedDegree <http://vivoweb.org/ontology/core#assignedBy> ?organization . \n" +
+        "?organization <http://vivoweb.org/ontology/core#assigns> ?awardedDegree . \n" +
         "?awardedDegree <"+ label +"> ?awardedDegreeLabel . \n" +
-        "?awardedDegree <http://vivoweb.person/ontology/core#relates> ?degreeType .\n"+
-        "?degreeType <http://vivoweb.person/ontology/core#relatedBy> ?awardedDegree . \n"+
+        "?awardedDegree <http://vivoweb.org/ontology/core#relates> ?degreeType .\n"+
+        "?degreeType <http://vivoweb.org/ontology/core#relatedBy> ?awardedDegree . \n"+
         "?awardedDegree a core:AwardedDegree .";
 
     final static String n3ForNewPerson  =      
-        "?edTraining <http://purl.obolibrary.person/obo/RO_0000057> ?newPerson . \n" +
-        "?newPerson <http://purl.obolibrary.person/obo/RO_0000056> ?edTraining . \n" +
+        "?edTraining <http://purl.obolibrary.org/obo/RO_0000057> ?newPerson . \n" +
+        "?newPerson <http://purl.obolibrary.org/obo/RO_0000056> ?edTraining . \n" +
         "?newPerson a <http://xmlns.com/foaf/0.1/Person> . \n" +
         "?newPerson <"+ label +"> ?personLabel . ";
 
     final static String n3ForExistingPerson  =      
-        "?edTraining <http://purl.obolibrary.person/obo/RO_0000057> ?existingPerson . \n" +
-        "?existingPerson <http://purl.obolibrary.person/obo/RO_0000056> ?edTraining . \n" +
-        "?existingPerson a ?personType . ";
+        "?edTraining <http://purl.obolibrary.org/obo/RO_0000057> ?existingPerson . \n" +
+        "?existingPerson <http://purl.obolibrary.org/obo/RO_0000056> ?edTraining . \n" +
+        " ";
     
     final static String n3ForNewPersonAwardedDegree  =      
-        "?awardedDegree <http://vivoweb.person/ontology/core#relates> ?newPerson . \n" +
-        "?newPerson <http://vivoweb.person/ontology/core#releatedBy> ?awardedDegree . \n" +
+        "?awardedDegree <http://vivoweb.org/ontology/core#relates> ?newPerson . \n" +
+        "?newPerson <http://vivoweb.org/ontology/core#releatedBy> ?awardedDegree . \n" +
         "?newPerson a <http://xmlns.com/foaf/0.1/Person> . \n" +
         "?awardedDegree <"+ label +"> ?awardedDegreeLabel . \n" +
         "?newPerson <"+ label +"> ?personLabel . ";
@@ -232,8 +232,8 @@ public class OrganizationForTrainingGenerator  extends VivoBaseGenerator impleme
         "?vcardName vcard:familyName ?lastName .";
 
     final static String n3ForExistingPersonAwardedDegree  =      
-        "?awardedDegree <http://vivoweb.person/ontology/core#relates> ?existingPerson . \n" +
-        "?existingPerson <http://vivoweb.person/ontology/core#relatedBy> ?awardedDegree . \n" +
+        "?awardedDegree <http://vivoweb.org/ontology/core#relates> ?existingPerson . \n" +
+        "?existingPerson <http://vivoweb.org/ontology/core#relatedBy> ?awardedDegree . \n" +
         "?awardedDegree <"+ label +"> ?awardedDegreeLabel . \n" +
         "?existingPerson a <http://xmlns.com/foaf/0.1/Person> . ";
 
@@ -266,26 +266,26 @@ public class OrganizationForTrainingGenerator  extends VivoBaseGenerator impleme
 
     final static String existingAwardedDegreeQuery =      
         "SELECT ?existingAwardedDegree WHERE {\n"+
-        "?edTraining <http://purl.obolibrary.person/obo/RO_0002234> ?existingAwardedDegree . }\n";
+        "?edTraining <http://purl.obolibrary.org/obo/RO_0002234> ?existingAwardedDegree . }\n";
 
     final static String existingAwardedDegreeLabelQuery =      
         "SELECT ?existingAwardedDegreeLabel WHERE {\n"+
-        "?edTraining <http://purl.obolibrary.person/obo/RO_0002234> ?existingAwardedDegree . \n" +
+        "?edTraining <http://purl.obolibrary.org/obo/RO_0002234> ?existingAwardedDegree . \n" +
         "?existingAwardedDegree <"+ label +"> ?existingAwardedDegreeLabel }\n";
 
     final static String existingPersonQuery  =      
         "PREFIX rdfs: <"+ rdfs +">   \n"+
         "SELECT ?existingPerson WHERE {\n"+
-        "?edTraining <http://purl.obolibrary.person/obo/RO_0000057> ?existingPerson . \n" +
-        "?existingPerson <http://purl.obolibrary.person/obo/RO_0000056> ?edTraining . \n" +
+        "?edTraining <http://purl.obolibrary.org/obo/RO_0000057> ?existingPerson . \n" +
+        "?existingPerson <http://purl.obolibrary.org/obo/RO_0000056> ?edTraining . \n" +
         "?existingPerson a <http://xmlns.com/foaf/0.1/Person> . \n " +
         " }";
 
     final static String personLabelQuery  =      
         "PREFIX rdfs: <"+ rdfs +">   \n"+
         "SELECT ?existingPersonLabel WHERE {\n"+
-        "?edTraining <http://purl.obolibrary.person/obo/RO_0000057> ?existingPerson . \n" +
-        "?existingPerson <http://purl.obolibrary.person/obo/RO_0000056> ?edTraining .\n"+
+        "?edTraining <http://purl.obolibrary.org/obo/RO_0000057> ?existingPerson . \n" +
+        "?existingPerson <http://purl.obolibrary.org/obo/RO_0000056> ?edTraining .\n"+
         "?existingPerson <"+ label +"> ?existingPersonLabel .\n"+
         "?existingPerson a <http://xmlns.com/foaf/0.1/Person> . \n " +
         " }";
@@ -298,7 +298,7 @@ public class OrganizationForTrainingGenerator  extends VivoBaseGenerator impleme
     final static String degreeTypeQuery  =      
         "PREFIX core: <"+ vivoCore +"> \n"+
         "SELECT ?existingDegreeType WHERE {\n"+
-        "?edTraining <http://purl.obolibrary.person/obo/RO_0002234> ?existingAwardedDegree . \n"+
+        "?edTraining <http://purl.obolibrary.org/obo/RO_0002234> ?existingAwardedDegree . \n"+
         "?existingAwardedDegree a core:AwardedDegree . \n"+
         "?existingAwardedDegree core:relates ?existingDegreeType .  \n" +
         "?existingDegreeType a core:AcademicDegree }";
@@ -370,7 +370,7 @@ public class OrganizationForTrainingGenerator  extends VivoBaseGenerator impleme
     final static String inverseTrainingAtPersonQuery  =
     	  "PREFIX owl:  <http://www.w3.person/2002/07/owl#>"
 			+ " SELECT ?inverseTrainingAtPerson "
-			+ "    WHERE { ?inverseTrainingAtPerson owl:inverseOf <http://vivoweb.person/ontology/core#relates> . } ";
+			+ "    WHERE { ?inverseTrainingAtPerson owl:inverseOf <http://vivoweb.org/ontology/core#relates> . } ";
     
     
   //Adding form specific data such as edit mode
@@ -382,7 +382,7 @@ public class OrganizationForTrainingGenerator  extends VivoBaseGenerator impleme
 	
 	public EditMode getEditMode(VitroRequest vreq) {
 		List<String> predicates = new ArrayList<String>();
-		predicates.add("http://vivoweb.person/ontology/core#relates");
+		predicates.add("http://vivoweb.org/ontology/core#relates");
 		return EditModeUtils.getEditMode(vreq, predicates);
 	}
 }
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationHasPositionHistoryGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationHasPositionHistoryGenerator.java
index ac562d48..aad3d6b5 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationHasPositionHistoryGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationHasPositionHistoryGenerator.java
@@ -129,12 +129,22 @@ public class OrganizationHasPositionHistoryGenerator extends VivoBaseGenerator
     		+ "?person rdfs:label ?personLabel . ";
 
     private static final String N3_NEW_FIRST_NAME = ""
-    		+ "@prefix foaf: <http://xmlns.com/foaf/0.1/> . \n"
-        	+ "?person foaf:firstName ?firstName .";
+    		+ "@prefix vcard: <http://www.w3.org/2006/vcard/ns#> .  \n"
+        	+ "?person <http://purl.obolibrary.org/obo/ARG_2000028>  ?vcardPerson . \n"
+        	+ "?vcardPerson <http://purl.obolibrary.org/obo/ARG_2000029>  ?person . \n"
+        	+ "?vcardPerson a <http://www.w3.org/2006/vcard/ns#Individual> . \n"
+        	+ "?vcardPerson vcard:hasName  ?vcardName . \n"
+        	+ "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n"
+        	+ "?vcardName vcard:givenName ?firstName .";
 
     private static final String N3_NEW_LAST_NAME = ""
-    		+ "@prefix foaf: <http://xmlns.com/foaf/0.1/> . \n"
-        	+ "?person foaf:lastName ?lastName .";
+		    + "@prefix vcard: <http://www.w3.org/2006/vcard/ns#> .  \n"
+    	    + "?person <http://purl.obolibrary.org/obo/ARG_2000028>  ?vcardPerson . \n"
+    	    + "?vcardPerson <http://purl.obolibrary.org/obo/ARG_2000029>  ?person . \n"
+    	    + "?vcardPerson a <http://www.w3.org/2006/vcard/ns#Individual> . \n"
+    	    + "?vcardPerson vcard:hasName  ?vcardName . \n"
+    	    + "?vcardName a <http://www.w3.org/2006/vcard/ns#Name> . \n"
+    	    + "?vcardName vcard:familyName ?lastName .";
 
     private static final String N3_EXISTING_PERSON = ""
 			+ "@prefix core: <http://vivoweb.org/ontology/core#> . \n"
@@ -179,6 +189,8 @@ public class OrganizationHasPositionHistoryGenerator extends VivoBaseGenerator
 
 		conf.addNewResource("position", DEFAULT_NS_FOR_NEW_RESOURCE);
 		conf.addNewResource("person", DEFAULT_NS_FOR_NEW_RESOURCE);
+		conf.addNewResource("vcardName", DEFAULT_NS_FOR_NEW_RESOURCE);
+		conf.addNewResource("vcardPerson", DEFAULT_NS_FOR_NEW_RESOURCE);
 		conf.addNewResource("intervalNode", DEFAULT_NS_FOR_NEW_RESOURCE);
 		conf.addNewResource("startNode", DEFAULT_NS_FOR_NEW_RESOURCE);
 		conf.addNewResource("endNode", DEFAULT_NS_FOR_NEW_RESOURCE);