diff --git a/server/book/schema.py b/server/book/schema.py
index cf44b4c9..0707bbce 100644
--- a/server/book/schema.py
+++ b/server/book/schema.py
@@ -6,7 +6,7 @@ from graphene_django.filter import DjangoFilterConnectionField
 from .models import Book, Topic, Module, Chapter, ContentBlock
 
 
-class ContentBlockNode(DjangoObjectType):
+class ContentBlockNodeType(DjangoObjectType):
     class Meta:
         model = ContentBlock
         only_fields = [
@@ -18,8 +18,8 @@ class ContentBlockNode(DjangoObjectType):
         interfaces = (relay.Node,)
 
 
-class ChapterNode(DjangoObjectType):
-    content_blocks = DjangoFilterConnectionField(ContentBlockNode)
+class ChapterType(DjangoObjectType):
+    content_blocks = DjangoFilterConnectionField(ContentBlockNodeType)
 
     class Meta:
         model = Chapter
@@ -35,9 +35,9 @@ class ChapterNode(DjangoObjectType):
         return ContentBlock.get_by_parent(self)
 
 
-class ModuleNode(DjangoObjectType):
+class ModuleType(DjangoObjectType):
     pk = graphene.Int()
-    chapters = DjangoFilterConnectionField(ChapterNode)
+    chapters = DjangoFilterConnectionField(ChapterType)
     hero_image = graphene.String()
 
     class Meta:
@@ -62,9 +62,9 @@ class ModuleNode(DjangoObjectType):
         return Chapter.get_by_parent(self)
 
 
-class TopicNode(DjangoObjectType):
+class TopicType(DjangoObjectType):
     pk = graphene.Int()
-    modules = DjangoFilterConnectionField(ModuleNode)
+    modules = DjangoFilterConnectionField(ModuleType)
 
     class Meta:
         model = Topic
@@ -84,9 +84,9 @@ class TopicNode(DjangoObjectType):
         return Module.get_by_parent(self)
 
 
-class BookNode(DjangoObjectType):
+class BookType(DjangoObjectType):
     pk = graphene.Int()
-    topics = DjangoFilterConnectionField(TopicNode)
+    topics = DjangoFilterConnectionField(TopicType)
 
     class Meta:
         model = Book
@@ -107,11 +107,11 @@ class BookNode(DjangoObjectType):
 
 
 class BookQuery(object):
-    module = relay.Node.Field(ModuleNode)
+    module = relay.Node.Field(ModuleType)
 
-    books = DjangoFilterConnectionField(BookNode)
-    topics = DjangoFilterConnectionField(TopicNode)
-    modules = DjangoFilterConnectionField(ModuleNode)
+    books = DjangoFilterConnectionField(BookType)
+    topics = DjangoFilterConnectionField(TopicType)
+    modules = DjangoFilterConnectionField(ModuleType)
 
     def resolve_books(self, *args, **kwargs):
         return Book.objects.filter(**kwargs).live()
diff --git a/server/objectives/schema.py b/server/objectives/schema.py
index 9e73bdd8..3774951e 100644
--- a/server/objectives/schema.py
+++ b/server/objectives/schema.py
@@ -6,7 +6,7 @@ from graphene_django.filter import DjangoFilterConnectionField
 from objectives.models import ObjectiveGroup, Objective, ObjectiveProgressStatus
 
 
-class ObjectiveGroupNode(DjangoObjectType):
+class ObjectiveGroupType(DjangoObjectType):
     pk = graphene.Int()
 
     class Meta:
@@ -18,7 +18,7 @@ class ObjectiveGroupNode(DjangoObjectType):
         return self.id
 
 
-class ObjectiveNode(DjangoObjectType):
+class ObjectiveType(DjangoObjectType):
     pk = graphene.Int()
 
     class Meta:
@@ -27,7 +27,7 @@ class ObjectiveNode(DjangoObjectType):
         interfaces = (relay.Node,)
 
 
-class ObjectiveProgressStatusNode(DjangoObjectType):
+class ObjectiveProgressStatusType(DjangoObjectType):
     pk = graphene.Int()
 
     class Meta:
@@ -40,4 +40,4 @@ class ObjectiveProgressStatusNode(DjangoObjectType):
 
 
 class ObjectivesQuery(object):
-    objective_groups = DjangoFilterConnectionField(ObjectiveGroupNode)
+    objective_groups = DjangoFilterConnectionField(ObjectiveGroupType)
diff --git a/server/rooms/schema.py b/server/rooms/schema.py
index e847c033..31a00a40 100644
--- a/server/rooms/schema.py
+++ b/server/rooms/schema.py
@@ -4,12 +4,12 @@ from graphene_django import DjangoObjectType
 from graphene_django.filter import DjangoFilterConnectionField
 
 from rooms.models import Room, RoomEntry
-from user.schema import UserGroupNode, UserNode
+from user.schema import UserGroupNode, UserType
 
 
-class RoomEntryNode(DjangoObjectType):
+class RoomEntryType(DjangoObjectType):
     pk = graphene.Int()
-    author = UserNode()
+    author = UserType()
 
     class Meta:
         model = RoomEntry
@@ -35,10 +35,10 @@ class RoomType(DjangoObjectType):
 
 class RoomsQuery(object):
     room = graphene.Field(RoomType, slug=graphene.String(), id=graphene.Int(), appearance=graphene.String())
-    room_entry = relay.Node.Field(RoomEntryNode)
+    room_entry = relay.Node.Field(RoomEntryType)
 
     all_rooms = DjangoFilterConnectionField(RoomType)
-    all_room_entries = DjangoFilterConnectionField(RoomEntryNode)
+    all_room_entries = DjangoFilterConnectionField(RoomEntryType)
 
     def resolve_room(self, info, **kwargs):
         slug = kwargs.get('slug')
diff --git a/server/user/schema.py b/server/user/schema.py
index d09198aa..6632e897 100644
--- a/server/user/schema.py
+++ b/server/user/schema.py
@@ -1,12 +1,11 @@
 import graphene
 from graphene import relay
 from graphene_django import DjangoObjectType
-from graphene_django.filter import DjangoFilterConnectionField
 
 from user.models import UserGroup, User
 
 
-class UserNode(DjangoObjectType):
+class UserType(DjangoObjectType):
     pk = graphene.Int()
 
     class Meta:
@@ -20,7 +19,6 @@ class UserNode(DjangoObjectType):
 
 class UserGroupNode(DjangoObjectType):
     pk = graphene.Int()
-    users = DjangoFilterConnectionField(UserNode)
 
     class Meta:
         model = UserGroup
@@ -29,6 +27,3 @@ class UserGroupNode(DjangoObjectType):
 
     def resolve_pk(self, *args, **kwargs):
         return self.id
-
-    def resolve_users(self, *args, **kwargs):
-        return self.users