diff --git a/services/graph/pkg/service/v0/schools.go b/services/graph/pkg/service/v0/educationschools.go
similarity index 91%
rename from services/graph/pkg/service/v0/schools.go
rename to services/graph/pkg/service/v0/educationschools.go
index bd33217b9..b26512c2c 100644
--- a/services/graph/pkg/service/v0/schools.go
+++ b/services/graph/pkg/service/v0/educationschools.go
@@ -17,8 +17,8 @@ import (
 	"github.com/go-chi/render"
 )
 
-// GetSchools implements the Service interface.
-func (g Graph) GetSchools(w http.ResponseWriter, r *http.Request) {
+// GetEducationSchools implements the Service interface.
+func (g Graph) GetEducationSchools(w http.ResponseWriter, r *http.Request) {
 	logger := g.logger.SubloggerWithRequestID(r.Context())
 	logger.Info().Interface("query", r.URL.Query()).Msg("calling get schools")
 	sanitizedPath := strings.TrimPrefix(r.URL.Path, "/graph/v1.0/")
@@ -41,7 +41,7 @@ func (g Graph) GetSchools(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	schools, err = sortSchools(odataReq, schools)
+	schools, err = sortEducationSchools(odataReq, schools)
 	if err != nil {
 		logger.Debug().Err(err).Interface("query", r.URL.Query()).Msg("cannot get schools: could not sort schools according to query")
 		errorcode.InvalidRequest.Render(w, r, http.StatusBadRequest, err.Error())
@@ -51,8 +51,8 @@ func (g Graph) GetSchools(w http.ResponseWriter, r *http.Request) {
 	render.JSON(w, r, &ListResponse{Value: schools})
 }
 
-// PostSchool implements the Service interface.
-func (g Graph) PostSchool(w http.ResponseWriter, r *http.Request) {
+// PostEducationSchool implements the Service interface.
+func (g Graph) PostEducationSchool(w http.ResponseWriter, r *http.Request) {
 	logger := g.logger.SubloggerWithRequestID(r.Context())
 	logger.Info().Msg("calling post school")
 	school := libregraph.NewEducationSchool()
@@ -104,8 +104,8 @@ func (g Graph) PostSchool(w http.ResponseWriter, r *http.Request) {
 	render.JSON(w, r, school)
 }
 
-// PatchSchool implements the Service interface.
-func (g Graph) PatchSchool(w http.ResponseWriter, r *http.Request) {
+// PatchEducationSchool implements the Service interface.
+func (g Graph) PatchEducationSchool(w http.ResponseWriter, r *http.Request) {
 	logger := g.logger.SubloggerWithRequestID(r.Context())
 	logger.Info().Msg("calling patch school")
 	schoolID := chi.URLParam(r, "schoolID")
@@ -141,8 +141,8 @@ func (g Graph) PatchSchool(w http.ResponseWriter, r *http.Request) {
 	render.NoContent(w, r)
 }
 
-// GetSchool implements the Service interface.
-func (g Graph) GetSchool(w http.ResponseWriter, r *http.Request) {
+// GetEducationSchool implements the Service interface.
+func (g Graph) GetEducationSchool(w http.ResponseWriter, r *http.Request) {
 	logger := g.logger.SubloggerWithRequestID(r.Context())
 	logger.Info().Msg("calling get school")
 	schoolID := chi.URLParam(r, "schoolID")
@@ -177,8 +177,8 @@ func (g Graph) GetSchool(w http.ResponseWriter, r *http.Request) {
 	render.JSON(w, r, school)
 }
 
-// DeleteSchool implements the Service interface.
-func (g Graph) DeleteSchool(w http.ResponseWriter, r *http.Request) {
+// DeleteEducationSchool implements the Service interface.
+func (g Graph) DeleteEducationSchool(w http.ResponseWriter, r *http.Request) {
 	logger := g.logger.SubloggerWithRequestID(r.Context())
 	logger.Info().Msg("calling delete school")
 	schoolID := chi.URLParam(r, "schoolID")
@@ -221,8 +221,8 @@ func (g Graph) DeleteSchool(w http.ResponseWriter, r *http.Request) {
 	render.NoContent(w, r)
 }
 
-// GetSchoolMembers implements the Service interface.
-func (g Graph) GetSchoolMembers(w http.ResponseWriter, r *http.Request) {
+// GetEducationSchoolMembers implements the Service interface.
+func (g Graph) GetEducationSchoolMembers(w http.ResponseWriter, r *http.Request) {
 	logger := g.logger.SubloggerWithRequestID(r.Context())
 	logger.Info().Msg("calling get school members")
 	schoolID := chi.URLParam(r, "schoolID")
@@ -256,8 +256,8 @@ func (g Graph) GetSchoolMembers(w http.ResponseWriter, r *http.Request) {
 	render.JSON(w, r, members)
 }
 
-// PostSchoolMember implements the Service interface.
-func (g Graph) PostSchoolMember(w http.ResponseWriter, r *http.Request) {
+// PostEducationSchoolMember implements the Service interface.
+func (g Graph) PostEducationSchoolMember(w http.ResponseWriter, r *http.Request) {
 	logger := g.logger.SubloggerWithRequestID(r.Context())
 	logger.Info().Msg("Calling post school member")
 
@@ -333,8 +333,8 @@ func (g Graph) PostSchoolMember(w http.ResponseWriter, r *http.Request) {
 	render.NoContent(w, r)
 }
 
-// DeleteSchoolMember implements the Service interface.
-func (g Graph) DeleteSchoolMember(w http.ResponseWriter, r *http.Request) {
+// DeleteEducationSchoolMember implements the Service interface.
+func (g Graph) DeleteEducationSchoolMember(w http.ResponseWriter, r *http.Request) {
 	logger := g.logger.SubloggerWithRequestID(r.Context())
 	logger.Info().Msg("calling delete school member")
 
@@ -391,7 +391,7 @@ func (g Graph) DeleteSchoolMember(w http.ResponseWriter, r *http.Request) {
 	render.NoContent(w, r)
 }
 
-func sortSchools(req *godata.GoDataRequest, schools []*libregraph.EducationSchool) ([]*libregraph.EducationSchool, error) {
+func sortEducationSchools(req *godata.GoDataRequest, schools []*libregraph.EducationSchool) ([]*libregraph.EducationSchool, error) {
 	var sorter sort.Interface
 	if req.Query.OrderBy == nil || len(req.Query.OrderBy.OrderByItems) != 1 {
 		return schools, nil
diff --git a/services/graph/pkg/service/v0/schools_test.go b/services/graph/pkg/service/v0/educationschools_test.go
similarity index 91%
rename from services/graph/pkg/service/v0/schools_test.go
rename to services/graph/pkg/service/v0/educationschools_test.go
index 93df95e9f..b4a6ded75 100644
--- a/services/graph/pkg/service/v0/schools_test.go
+++ b/services/graph/pkg/service/v0/educationschools_test.go
@@ -73,10 +73,10 @@ var _ = Describe("Schools", func() {
 		)
 	})
 
-	Describe("GetSchools", func() {
+	Describe("GetEducationSchools", func() {
 		It("handles invalid ODATA parameters", func() {
 			r := httptest.NewRequest(http.MethodGet, "/graph/v1.0/education/schools?§foo=bar", nil)
-			svc.GetSchools(rr, r)
+			svc.GetEducationSchools(rr, r)
 
 			Expect(rr.Code).To(Equal(http.StatusBadRequest))
 		})
@@ -85,7 +85,7 @@ var _ = Describe("Schools", func() {
 			identityEducationBackend.On("GetSchools", ctx, mock.Anything).Return([]*libregraph.EducationSchool{newSchool}, nil)
 
 			r := httptest.NewRequest(http.MethodGet, "/graph/v1.0/education/schools?$orderby=invalid", nil)
-			svc.GetSchools(rr, r)
+			svc.GetEducationSchools(rr, r)
 
 			Expect(rr.Code).To(Equal(http.StatusBadRequest))
 			data, err := io.ReadAll(rr.Body)
@@ -101,7 +101,7 @@ var _ = Describe("Schools", func() {
 			identityEducationBackend.On("GetSchools", ctx, mock.Anything).Return(nil, errors.New("failed"))
 
 			r := httptest.NewRequest(http.MethodGet, "/graph/v1.0/education/schools", nil)
-			svc.GetSchools(rr, r)
+			svc.GetEducationSchools(rr, r)
 			Expect(rr.Code).To(Equal(http.StatusInternalServerError))
 			data, err := io.ReadAll(rr.Body)
 			Expect(err).ToNot(HaveOccurred())
@@ -116,7 +116,7 @@ var _ = Describe("Schools", func() {
 			identityEducationBackend.On("GetSchools", ctx, mock.Anything).Return(nil, errorcode.New(errorcode.AccessDenied, "access denied"))
 
 			r := httptest.NewRequest(http.MethodGet, "/graph/v1.0/education/schools", nil)
-			svc.GetSchools(rr, r)
+			svc.GetEducationSchools(rr, r)
 
 			Expect(rr.Code).To(Equal(http.StatusInternalServerError))
 			data, err := io.ReadAll(rr.Body)
@@ -132,7 +132,7 @@ var _ = Describe("Schools", func() {
 			identityEducationBackend.On("GetSchools", ctx, mock.Anything).Return([]*libregraph.EducationSchool{}, nil)
 
 			r := httptest.NewRequest(http.MethodGet, "/graph/v1.0/education/schools", nil)
-			svc.GetSchools(rr, r)
+			svc.GetEducationSchools(rr, r)
 
 			Expect(rr.Code).To(Equal(http.StatusOK))
 			data, err := io.ReadAll(rr.Body)
@@ -148,7 +148,7 @@ var _ = Describe("Schools", func() {
 			identityEducationBackend.On("GetSchools", ctx, mock.Anything).Return([]*libregraph.EducationSchool{newSchool}, nil)
 
 			r := httptest.NewRequest(http.MethodGet, "/graph/v1.0/education/schools", nil)
-			svc.GetSchools(rr, r)
+			svc.GetEducationSchools(rr, r)
 
 			Expect(rr.Code).To(Equal(http.StatusOK))
 			data, err := io.ReadAll(rr.Body)
@@ -163,10 +163,10 @@ var _ = Describe("Schools", func() {
 		})
 	})
 
-	Describe("GetSchool", func() {
+	Describe("GetEducationSchool", func() {
 		It("handles missing or empty school id", func() {
 			r := httptest.NewRequest(http.MethodGet, "/graph/v1.0/education/schools", nil)
-			svc.GetSchool(rr, r)
+			svc.GetEducationSchool(rr, r)
 
 			Expect(rr.Code).To(Equal(http.StatusBadRequest))
 
@@ -174,7 +174,7 @@ var _ = Describe("Schools", func() {
 			rctx := chi.NewRouteContext()
 			rctx.URLParams.Add("schoolID", "")
 			r = r.WithContext(context.WithValue(ctxpkg.ContextSetUser(ctx, nil), chi.RouteCtxKey, rctx))
-			svc.GetSchool(rr, r)
+			svc.GetEducationSchool(rr, r)
 
 			Expect(rr.Code).To(Equal(http.StatusBadRequest))
 		})
@@ -190,18 +190,18 @@ var _ = Describe("Schools", func() {
 				rctx.URLParams.Add("schoolID", *newSchool.Id)
 				r = r.WithContext(context.WithValue(ctxpkg.ContextSetUser(ctx, nil), chi.RouteCtxKey, rctx))
 
-				svc.GetSchool(rr, r)
+				svc.GetEducationSchool(rr, r)
 
 				Expect(rr.Code).To(Equal(http.StatusOK))
 			})
 		})
 	})
 
-	Describe("PostSchool", func() {
+	Describe("PostEducationSchool", func() {
 		It("handles invalid body", func() {
 			r := httptest.NewRequest(http.MethodPost, "/graph/v1.0/education/schools/", bytes.NewBufferString("{invalid"))
 
-			svc.PostSchool(rr, r)
+			svc.PostEducationSchool(rr, r)
 			Expect(rr.Code).To(Equal(http.StatusBadRequest))
 		})
 
@@ -213,7 +213,7 @@ var _ = Describe("Schools", func() {
 
 			r := httptest.NewRequest(http.MethodPost, "/graph/v1.0/education/schools/", bytes.NewBuffer(newSchoolJson))
 
-			svc.PostSchool(rr, r)
+			svc.PostEducationSchool(rr, r)
 			Expect(rr.Code).To(Equal(http.StatusBadRequest))
 		})
 
@@ -225,7 +225,7 @@ var _ = Describe("Schools", func() {
 
 			r := httptest.NewRequest(http.MethodPost, "/graph/v1.0/education/schools/", bytes.NewBuffer(newSchoolJson))
 
-			svc.PostSchool(rr, r)
+			svc.PostEducationSchool(rr, r)
 			Expect(rr.Code).To(Equal(http.StatusBadRequest))
 		})
 
@@ -239,7 +239,7 @@ var _ = Describe("Schools", func() {
 
 			r := httptest.NewRequest(http.MethodPost, "/graph/v1.0/education/schools/", bytes.NewBuffer(newSchoolJson))
 
-			svc.PostSchool(rr, r)
+			svc.PostEducationSchool(rr, r)
 			Expect(rr.Code).To(Equal(http.StatusBadRequest))
 		})
 
@@ -254,7 +254,7 @@ var _ = Describe("Schools", func() {
 
 			r := httptest.NewRequest(http.MethodPost, "/graph/v1.0/education/schools/", bytes.NewBuffer(newSchoolJson))
 
-			svc.PostSchool(rr, r)
+			svc.PostEducationSchool(rr, r)
 
 			Expect(rr.Code).To(Equal(http.StatusInternalServerError))
 		})
@@ -270,24 +270,24 @@ var _ = Describe("Schools", func() {
 
 			r := httptest.NewRequest(http.MethodPost, "/graph/v1.0/education/schools/", bytes.NewBuffer(newSchoolJson))
 
-			svc.PostSchool(rr, r)
+			svc.PostEducationSchool(rr, r)
 
 			Expect(rr.Code).To(Equal(http.StatusCreated))
 		})
 	})
-	Describe("PatchSchool", func() {
+	Describe("PatchEducationSchool", func() {
 		It("handles invalid body", func() {
 			r := httptest.NewRequest(http.MethodPatch, "/graph/v1.0/education/schools/", bytes.NewBufferString("{invalid"))
 			rctx := chi.NewRouteContext()
 			rctx.URLParams.Add("schoolID", *newSchool.Id)
 			r = r.WithContext(context.WithValue(ctxpkg.ContextSetUser(ctx, currentUser), chi.RouteCtxKey, rctx))
-			svc.PatchSchool(rr, r)
+			svc.PatchEducationSchool(rr, r)
 			Expect(rr.Code).To(Equal(http.StatusBadRequest))
 		})
 
 		It("handles missing or empty school id", func() {
 			r := httptest.NewRequest(http.MethodPatch, "/graph/v1.0/education/schools", nil)
-			svc.PatchSchool(rr, r)
+			svc.PatchEducationSchool(rr, r)
 
 			Expect(rr.Code).To(Equal(http.StatusBadRequest))
 
@@ -295,7 +295,7 @@ var _ = Describe("Schools", func() {
 			rctx := chi.NewRouteContext()
 			rctx.URLParams.Add("schoolID", "")
 			r = r.WithContext(context.WithValue(ctxpkg.ContextSetUser(ctx, currentUser), chi.RouteCtxKey, rctx))
-			svc.PatchSchool(rr, r)
+			svc.PatchEducationSchool(rr, r)
 
 			Expect(rr.Code).To(Equal(http.StatusBadRequest))
 		})
@@ -305,7 +305,7 @@ var _ = Describe("Schools", func() {
 			rctx := chi.NewRouteContext()
 			rctx.URLParams.Add("schoolID", "school%id")
 			r = r.WithContext(context.WithValue(ctxpkg.ContextSetUser(ctx, currentUser), chi.RouteCtxKey, rctx))
-			svc.PatchSchool(rr, r)
+			svc.PatchEducationSchool(rr, r)
 
 			Expect(rr.Code).To(Equal(http.StatusBadRequest))
 		})
@@ -321,13 +321,13 @@ var _ = Describe("Schools", func() {
 			rctx.URLParams.Add("schoolID", "school-id")
 			r = r.WithContext(context.WithValue(ctxpkg.ContextSetUser(ctx, currentUser), chi.RouteCtxKey, rctx))
 
-			svc.PatchSchool(rr, r)
+			svc.PatchEducationSchool(rr, r)
 
 			Expect(rr.Code).To(Equal(http.StatusNoContent))
 		})
 	})
 
-	Describe("DeleteSchool", func() {
+	Describe("DeleteEducationSchool", func() {
 		Context("with an existing school", func() {
 			BeforeEach(func() {
 				identityEducationBackend.On("GetSchool", mock.Anything, mock.Anything, mock.Anything).Return(newSchool, nil)
@@ -340,14 +340,14 @@ var _ = Describe("Schools", func() {
 			rctx := chi.NewRouteContext()
 			rctx.URLParams.Add("schoolID", *newSchool.Id)
 			r = r.WithContext(context.WithValue(ctxpkg.ContextSetUser(ctx, currentUser), chi.RouteCtxKey, rctx))
-			svc.DeleteSchool(rr, r)
+			svc.DeleteEducationSchool(rr, r)
 
 			Expect(rr.Code).To(Equal(http.StatusNoContent))
 			identityEducationBackend.AssertNumberOfCalls(GinkgoT(), "DeleteSchool", 1)
 		})
 	})
 
-	Describe("GetSchoolMembers", func() {
+	Describe("GetEducationSchoolMembers", func() {
 		It("gets the list of members", func() {
 			user := libregraph.NewEducationUser()
 			user.SetId("user")
@@ -357,7 +357,7 @@ var _ = Describe("Schools", func() {
 			rctx := chi.NewRouteContext()
 			rctx.URLParams.Add("schoolID", *newSchool.Id)
 			r = r.WithContext(context.WithValue(ctxpkg.ContextSetUser(ctx, currentUser), chi.RouteCtxKey, rctx))
-			svc.GetSchoolMembers(rr, r)
+			svc.GetEducationSchoolMembers(rr, r)
 			Expect(rr.Code).To(Equal(http.StatusOK))
 
 			data, err := io.ReadAll(rr.Body)
@@ -372,13 +372,13 @@ var _ = Describe("Schools", func() {
 		})
 	})
 
-	Describe("PostSchoolMembers", func() {
+	Describe("PostEducationSchoolMembers", func() {
 		It("fails on invalid body", func() {
 			r := httptest.NewRequest(http.MethodPost, "/graph/v1.0/education/schools/{schoolID}/members", bytes.NewBufferString("{invalid"))
 			rctx := chi.NewRouteContext()
 			rctx.URLParams.Add("schoolID", *newSchool.Id)
 			r = r.WithContext(context.WithValue(ctxpkg.ContextSetUser(ctx, currentUser), chi.RouteCtxKey, rctx))
-			svc.PostSchoolMember(rr, r)
+			svc.PostEducationSchoolMember(rr, r)
 			Expect(rr.Code).To(Equal(http.StatusBadRequest))
 		})
 
@@ -391,7 +391,7 @@ var _ = Describe("Schools", func() {
 			rctx := chi.NewRouteContext()
 			rctx.URLParams.Add("schoolID", *newSchool.Id)
 			r = r.WithContext(context.WithValue(ctxpkg.ContextSetUser(ctx, currentUser), chi.RouteCtxKey, rctx))
-			svc.PostSchoolMember(rr, r)
+			svc.PostEducationSchoolMember(rr, r)
 			Expect(rr.Code).To(Equal(http.StatusBadRequest))
 		})
 
@@ -405,7 +405,7 @@ var _ = Describe("Schools", func() {
 			rctx := chi.NewRouteContext()
 			rctx.URLParams.Add("schoolID", *newSchool.Id)
 			r = r.WithContext(context.WithValue(ctxpkg.ContextSetUser(ctx, currentUser), chi.RouteCtxKey, rctx))
-			svc.PostSchoolMember(rr, r)
+			svc.PostEducationSchoolMember(rr, r)
 			Expect(rr.Code).To(Equal(http.StatusBadRequest))
 		})
 
@@ -420,20 +420,20 @@ var _ = Describe("Schools", func() {
 			rctx := chi.NewRouteContext()
 			rctx.URLParams.Add("schoolID", *newSchool.Id)
 			r = r.WithContext(context.WithValue(ctxpkg.ContextSetUser(ctx, currentUser), chi.RouteCtxKey, rctx))
-			svc.PostSchoolMember(rr, r)
+			svc.PostEducationSchoolMember(rr, r)
 			Expect(rr.Code).To(Equal(http.StatusNoContent))
 
 			identityEducationBackend.AssertNumberOfCalls(GinkgoT(), "AddMembersToSchool", 1)
 		})
 	})
 
-	Describe("DeleteSchoolMembers", func() {
+	Describe("DeleteEducationSchoolMembers", func() {
 		It("handles missing or empty member id", func() {
 			r := httptest.NewRequest(http.MethodDelete, "/graph/v1.0/education/schools/{schoolID}/members/{memberID}/$ref", nil)
 			rctx := chi.NewRouteContext()
 			rctx.URLParams.Add("schoolID", *newSchool.Id)
 			r = r.WithContext(context.WithValue(ctxpkg.ContextSetUser(ctx, currentUser), chi.RouteCtxKey, rctx))
-			svc.DeleteSchoolMember(rr, r)
+			svc.DeleteEducationSchoolMember(rr, r)
 			Expect(rr.Code).To(Equal(http.StatusBadRequest))
 		})
 		It("handles missing or empty member id", func() {
@@ -441,7 +441,7 @@ var _ = Describe("Schools", func() {
 			rctx := chi.NewRouteContext()
 			rctx.URLParams.Add("memberID", "/users/user")
 			r = r.WithContext(context.WithValue(ctxpkg.ContextSetUser(ctx, currentUser), chi.RouteCtxKey, rctx))
-			svc.DeleteSchoolMember(rr, r)
+			svc.DeleteEducationSchoolMember(rr, r)
 			Expect(rr.Code).To(Equal(http.StatusBadRequest))
 		})
 
@@ -453,7 +453,7 @@ var _ = Describe("Schools", func() {
 			rctx.URLParams.Add("schoolID", *newSchool.Id)
 			rctx.URLParams.Add("memberID", "/users/user1")
 			r = r.WithContext(context.WithValue(ctxpkg.ContextSetUser(ctx, currentUser), chi.RouteCtxKey, rctx))
-			svc.DeleteSchoolMember(rr, r)
+			svc.DeleteEducationSchoolMember(rr, r)
 			Expect(rr.Code).To(Equal(http.StatusNoContent))
 
 			identityEducationBackend.AssertNumberOfCalls(GinkgoT(), "RemoveMemberFromSchool", 1)
diff --git a/services/graph/pkg/service/v0/instrument.go b/services/graph/pkg/service/v0/instrument.go
index 41caf602e..81fc6dbbf 100644
--- a/services/graph/pkg/service/v0/instrument.go
+++ b/services/graph/pkg/service/v0/instrument.go
@@ -99,44 +99,44 @@ func (i instrument) DeleteGroupMember(w http.ResponseWriter, r *http.Request) {
 	i.next.DeleteGroupMember(w, r)
 }
 
-// GetSchools implements the Service interface.
-func (i instrument) GetSchools(w http.ResponseWriter, r *http.Request) {
-	i.next.GetSchools(w, r)
+// GetEducationSchools implements the Service interface.
+func (i instrument) GetEducationSchools(w http.ResponseWriter, r *http.Request) {
+	i.next.GetEducationSchools(w, r)
 }
 
-// GetSchool implements the Service interface.
-func (i instrument) GetSchool(w http.ResponseWriter, r *http.Request) {
-	i.next.GetSchool(w, r)
+// GetEducationSchool implements the Service interface.
+func (i instrument) GetEducationSchool(w http.ResponseWriter, r *http.Request) {
+	i.next.GetEducationSchool(w, r)
 }
 
-// PostSchool implements the Service interface.
-func (i instrument) PostSchool(w http.ResponseWriter, r *http.Request) {
-	i.next.PostSchool(w, r)
+// PostEducationSchool implements the Service interface.
+func (i instrument) PostEducationSchool(w http.ResponseWriter, r *http.Request) {
+	i.next.PostEducationSchool(w, r)
 }
 
-// PatchSchool implements the Service interface.
-func (i instrument) PatchSchool(w http.ResponseWriter, r *http.Request) {
-	i.next.PatchSchool(w, r)
+// PatchEducationSchool implements the Service interface.
+func (i instrument) PatchEducationSchool(w http.ResponseWriter, r *http.Request) {
+	i.next.PatchEducationSchool(w, r)
 }
 
-// DeleteSchool implements the Service interface.
-func (i instrument) DeleteSchool(w http.ResponseWriter, r *http.Request) {
-	i.next.DeleteSchool(w, r)
+// DeleteEducationSchool implements the Service interface.
+func (i instrument) DeleteEducationSchool(w http.ResponseWriter, r *http.Request) {
+	i.next.DeleteEducationSchool(w, r)
 }
 
-// GetSchoolMembers implements the Service interface.
-func (i instrument) GetSchoolMembers(w http.ResponseWriter, r *http.Request) {
-	i.next.GetSchoolMembers(w, r)
+// GetEducationSchoolMembers implements the Service interface.
+func (i instrument) GetEducationSchoolMembers(w http.ResponseWriter, r *http.Request) {
+	i.next.GetEducationSchoolMembers(w, r)
 }
 
-// PostSchoolMember implements the Service interface.
-func (i instrument) PostSchoolMember(w http.ResponseWriter, r *http.Request) {
-	i.next.PostSchoolMember(w, r)
+// PostEducationSchoolMember implements the Service interface.
+func (i instrument) PostEducationSchoolMember(w http.ResponseWriter, r *http.Request) {
+	i.next.PostEducationSchoolMember(w, r)
 }
 
-// DeleteSchoolMember implements the Service interface.
-func (i instrument) DeleteSchoolMember(w http.ResponseWriter, r *http.Request) {
-	i.next.DeleteSchoolMember(w, r)
+// DeleteEducationSchoolMember implements the Service interface.
+func (i instrument) DeleteEducationSchoolMember(w http.ResponseWriter, r *http.Request) {
+	i.next.DeleteEducationSchoolMember(w, r)
 }
 
 // GetEducationUsers implements the Service interface.
diff --git a/services/graph/pkg/service/v0/logging.go b/services/graph/pkg/service/v0/logging.go
index aa822531c..69361da2c 100644
--- a/services/graph/pkg/service/v0/logging.go
+++ b/services/graph/pkg/service/v0/logging.go
@@ -99,44 +99,44 @@ func (l logging) DeleteGroupMember(w http.ResponseWriter, r *http.Request) {
 	l.next.DeleteGroupMember(w, r)
 }
 
-// GetSchools implements the Service interface.
-func (l logging) GetSchools(w http.ResponseWriter, r *http.Request) {
-	l.next.GetSchools(w, r)
+// GetEducationSchools implements the Service interface.
+func (l logging) GetEducationSchools(w http.ResponseWriter, r *http.Request) {
+	l.next.GetEducationSchools(w, r)
 }
 
-// GetSchool implements the Service interface.
-func (l logging) GetSchool(w http.ResponseWriter, r *http.Request) {
-	l.next.GetSchool(w, r)
+// GetEducationSchool implements the Service interface.
+func (l logging) GetEducationSchool(w http.ResponseWriter, r *http.Request) {
+	l.next.GetEducationSchool(w, r)
 }
 
-// PostSchool implements the Service interface.
-func (l logging) PostSchool(w http.ResponseWriter, r *http.Request) {
-	l.next.PostSchool(w, r)
+// PostEducationSchool implements the Service interface.
+func (l logging) PostEducationSchool(w http.ResponseWriter, r *http.Request) {
+	l.next.PostEducationSchool(w, r)
 }
 
-// PatchSchool implements the Service interface.
-func (l logging) PatchSchool(w http.ResponseWriter, r *http.Request) {
-	l.next.PatchSchool(w, r)
+// PatchEducationSchool implements the Service interface.
+func (l logging) PatchEducationSchool(w http.ResponseWriter, r *http.Request) {
+	l.next.PatchEducationSchool(w, r)
 }
 
-// DeleteSchool implements the Service interface.
-func (l logging) DeleteSchool(w http.ResponseWriter, r *http.Request) {
-	l.next.DeleteSchool(w, r)
+// DeleteEducationSchool implements the Service interface.
+func (l logging) DeleteEducationSchool(w http.ResponseWriter, r *http.Request) {
+	l.next.DeleteEducationSchool(w, r)
 }
 
-// GetSchoolMembers implements the Service interface.
-func (l logging) GetSchoolMembers(w http.ResponseWriter, r *http.Request) {
-	l.next.GetSchoolMembers(w, r)
+// GetEducationSchoolMembers implements the Service interface.
+func (l logging) GetEducationSchoolMembers(w http.ResponseWriter, r *http.Request) {
+	l.next.GetEducationSchoolMembers(w, r)
 }
 
-// PostSchoolMember implements the Service interface.
-func (l logging) PostSchoolMember(w http.ResponseWriter, r *http.Request) {
-	l.next.PostSchoolMember(w, r)
+// PostEducationSchoolMember implements the Service interface.
+func (l logging) PostEducationSchoolMember(w http.ResponseWriter, r *http.Request) {
+	l.next.PostEducationSchoolMember(w, r)
 }
 
-// DeleteSchoolMember implements the Service interface.
-func (l logging) DeleteSchoolMember(w http.ResponseWriter, r *http.Request) {
-	l.next.DeleteSchoolMember(w, r)
+// DeleteEducationSchoolMember implements the Service interface.
+func (l logging) DeleteEducationSchoolMember(w http.ResponseWriter, r *http.Request) {
+	l.next.DeleteEducationSchoolMember(w, r)
 }
 
 // GetEducationUsers implements the Service interface.
diff --git a/services/graph/pkg/service/v0/service.go b/services/graph/pkg/service/v0/service.go
index 639a45f0d..16b37e53d 100644
--- a/services/graph/pkg/service/v0/service.go
+++ b/services/graph/pkg/service/v0/service.go
@@ -47,14 +47,14 @@ type Service interface {
 	PostGroupMember(http.ResponseWriter, *http.Request)
 	DeleteGroupMember(http.ResponseWriter, *http.Request)
 
-	GetSchools(http.ResponseWriter, *http.Request)
-	GetSchool(http.ResponseWriter, *http.Request)
-	PostSchool(http.ResponseWriter, *http.Request)
-	PatchSchool(http.ResponseWriter, *http.Request)
-	DeleteSchool(http.ResponseWriter, *http.Request)
-	GetSchoolMembers(http.ResponseWriter, *http.Request)
-	PostSchoolMember(http.ResponseWriter, *http.Request)
-	DeleteSchoolMember(http.ResponseWriter, *http.Request)
+	GetEducationSchools(http.ResponseWriter, *http.Request)
+	GetEducationSchool(http.ResponseWriter, *http.Request)
+	PostEducationSchool(http.ResponseWriter, *http.Request)
+	PatchEducationSchool(http.ResponseWriter, *http.Request)
+	DeleteEducationSchool(http.ResponseWriter, *http.Request)
+	GetEducationSchoolMembers(http.ResponseWriter, *http.Request)
+	PostEducationSchoolMember(http.ResponseWriter, *http.Request)
+	DeleteEducationSchoolMember(http.ResponseWriter, *http.Request)
 
 	GetEducationUsers(http.ResponseWriter, *http.Request)
 	GetEducationUser(http.ResponseWriter, *http.Request)
@@ -244,16 +244,16 @@ func NewService(opts ...Option) Service {
 			})
 			r.With(requireAdmin).Route("/education", func(r chi.Router) {
 				r.Route("/schools", func(r chi.Router) {
-					r.Get("/", svc.GetSchools)
-					r.Post("/", svc.PostSchool)
+					r.Get("/", svc.GetEducationSchools)
+					r.Post("/", svc.PostEducationSchool)
 					r.Route("/{schoolID}", func(r chi.Router) {
-						r.Get("/", svc.GetSchool)
-						r.Delete("/", svc.DeleteSchool)
-						r.Patch("/", svc.PatchSchool)
+						r.Get("/", svc.GetEducationSchool)
+						r.Delete("/", svc.DeleteEducationSchool)
+						r.Patch("/", svc.PatchEducationSchool)
 						r.Route("/members", func(r chi.Router) {
-							r.Get("/", svc.GetSchoolMembers)
-							r.Post("/$ref", svc.PostSchoolMember)
-							r.Delete("/{memberID}/$ref", svc.DeleteSchoolMember)
+							r.Get("/", svc.GetEducationSchoolMembers)
+							r.Post("/$ref", svc.PostEducationSchoolMember)
+							r.Delete("/{memberID}/$ref", svc.DeleteEducationSchoolMember)
 						})
 					})
 				})
diff --git a/services/graph/pkg/service/v0/tracing.go b/services/graph/pkg/service/v0/tracing.go
index 5d261a4d2..306cf7445 100644
--- a/services/graph/pkg/service/v0/tracing.go
+++ b/services/graph/pkg/service/v0/tracing.go
@@ -95,44 +95,44 @@ func (t tracing) DeleteGroupMember(w http.ResponseWriter, r *http.Request) {
 	t.next.DeleteGroupMember(w, r)
 }
 
-// GetSchools implements the Service interface.
-func (t tracing) GetSchools(w http.ResponseWriter, r *http.Request) {
-	t.next.GetSchools(w, r)
+// GetEducationSchools implements the Service interface.
+func (t tracing) GetEducationSchools(w http.ResponseWriter, r *http.Request) {
+	t.next.GetEducationSchools(w, r)
 }
 
-// GetSchool implements the Service interface.
-func (t tracing) GetSchool(w http.ResponseWriter, r *http.Request) {
-	t.next.GetSchool(w, r)
+// GetEducationSchool implements the Service interface.
+func (t tracing) GetEducationSchool(w http.ResponseWriter, r *http.Request) {
+	t.next.GetEducationSchool(w, r)
 }
 
-// PostSchool implements the Service interface.
-func (t tracing) PostSchool(w http.ResponseWriter, r *http.Request) {
-	t.next.PostSchool(w, r)
+// PostEducationSchool implements the Service interface.
+func (t tracing) PostEducationSchool(w http.ResponseWriter, r *http.Request) {
+	t.next.PostEducationSchool(w, r)
 }
 
-// PatchSchool implements the Service interface.
-func (t tracing) PatchSchool(w http.ResponseWriter, r *http.Request) {
-	t.next.PatchSchool(w, r)
+// PatchEducationSchool implements the Service interface.
+func (t tracing) PatchEducationSchool(w http.ResponseWriter, r *http.Request) {
+	t.next.PatchEducationSchool(w, r)
 }
 
-// DeleteSchool implements the Service interface.
-func (t tracing) DeleteSchool(w http.ResponseWriter, r *http.Request) {
-	t.next.DeleteSchool(w, r)
+// DeleteEducationSchool implements the Service interface.
+func (t tracing) DeleteEducationSchool(w http.ResponseWriter, r *http.Request) {
+	t.next.DeleteEducationSchool(w, r)
 }
 
-// GetSchoolMembers implements the Service interface.
-func (t tracing) GetSchoolMembers(w http.ResponseWriter, r *http.Request) {
-	t.next.GetSchoolMembers(w, r)
+// GetEducationSchoolMembers implements the Service interface.
+func (t tracing) GetEducationSchoolMembers(w http.ResponseWriter, r *http.Request) {
+	t.next.GetEducationSchoolMembers(w, r)
 }
 
-// PostSchoolMember implements the Service interface.
-func (t tracing) PostSchoolMember(w http.ResponseWriter, r *http.Request) {
-	t.next.PostSchoolMember(w, r)
+// PostEducationSchoolMember implements the Service interface.
+func (t tracing) PostEducationSchoolMember(w http.ResponseWriter, r *http.Request) {
+	t.next.PostEducationSchoolMember(w, r)
 }
 
-// DeleteSchoolMember implements the Service interface.
-func (t tracing) DeleteSchoolMember(w http.ResponseWriter, r *http.Request) {
-	t.next.DeleteSchoolMember(w, r)
+// DeleteEducationSchoolMember implements the Service interface.
+func (t tracing) DeleteEducationSchoolMember(w http.ResponseWriter, r *http.Request) {
+	t.next.DeleteEducationSchoolMember(w, r)
 }
 
 // GetEducationUsers implements the Service interface.