diff --git a/client/src/graphql/gql/basicKnowledgeQuery.gql b/client/src/graphql/gql/basicKnowledgeQuery.gql
deleted file mode 100644
index cce9849e..00000000
--- a/client/src/graphql/gql/basicKnowledgeQuery.gql
+++ /dev/null
@@ -1,9 +0,0 @@
-query BasicKnowledgeQuery($slug: String!){
-  basicKnowledge(slug: $slug) {
-    id
-    title
-    slug
-    type
-    contents
-  }
-}
diff --git a/client/src/graphql/gql/instrumentQuery.gql b/client/src/graphql/gql/instrumentQuery.gql
new file mode 100644
index 00000000..2f7f0e07
--- /dev/null
+++ b/client/src/graphql/gql/instrumentQuery.gql
@@ -0,0 +1,9 @@
+query InstrumentQuery($slug: String!){
+  instrument(slug: $slug) {
+    id
+    title
+    slug
+    type
+    contents
+  }
+}
diff --git a/client/src/pages/instrument.vue b/client/src/pages/instrument.vue
index 46aaab7f..2ca8c82b 100644
--- a/client/src/pages/instrument.vue
+++ b/client/src/pages/instrument.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="instrument">
-    <h1 class="instrument__title">{{basicKnowledge.title}}</h1>
+    <h1 class="instrument__title">{{instrument.title}}</h1>
 
-    <component v-for="component in basicKnowledge.contents"
+    <component v-for="component in instrument.contents"
                :key="component.id"
                :is="component.type"
                v-bind="component">
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-  import BASIC_KNOWLEDGE_QUERY from '@/graphql/gql/basicKnowledgeQuery.gql';
+  import INSTRUMENT_QUERY from '@/graphql/gql/instrumentQuery.gql';
 
   import TextBlock from '@/components/content-blocks/TextBlock';
   import InstrumentWidget from '@/components/content-blocks/InstrumentWidget';
@@ -25,9 +25,9 @@
 
   export default {
     apollo: {
-      basicKnowledge() {
+      instrument() {
         return {
-          query: BASIC_KNOWLEDGE_QUERY,
+          query: INSTRUMENT_QUERY,
           variables: {
             slug: this.$route.params.slug
           }
@@ -49,7 +49,7 @@
 
     data() {
       return {
-        basicKnowledge: {}
+        instrument: {}
       }
     }
   }
diff --git a/server/basicknowledge/queries.py b/server/basicknowledge/queries.py
index aadb4eca..6b079d0d 100644
--- a/server/basicknowledge/queries.py
+++ b/server/basicknowledge/queries.py
@@ -10,7 +10,7 @@ from .models import BasicKnowledge
 class BasicKnowledgeNode(DjangoObjectType):
     class Meta:
         model = BasicKnowledge
-        filter_fields = ['slug']
+        filter_fields = ['slug', 'type']
         interfaces = (relay.Node,)
         only_fields = [
             'slug', 'title', 'type', 'contents',
@@ -18,10 +18,10 @@ class BasicKnowledgeNode(DjangoObjectType):
 
 
 class BasicKnowledgeQuery(object):
-    basic_knowledge = graphene.Field(BasicKnowledgeNode, slug=graphene.String(), id=graphene.ID())
-    basic_knowledge_pages = DjangoFilterConnectionField(BasicKnowledgeNode)
+    instrument = graphene.Field(BasicKnowledgeNode, slug=graphene.String(), id=graphene.ID())
+    instruments = DjangoFilterConnectionField(BasicKnowledgeNode)
 
-    def resolve_basic_knowledge(self, info, **kwargs):
+    def resolve_instrument(self, info, **kwargs):
         slug = kwargs.get('slug')
         room_id = kwargs.get('id')