diff --git a/library.json b/library.json
index 265add6..f2c201a 100644
--- a/library.json
+++ b/library.json
@@ -5,7 +5,8 @@
   "minorVersion": 0,
   "patchVersion": 6,
   "runnable": 1,
-  "machineName": "H5P.QuestionSet",
+  "name": "h5p-question-set",
+  "class": "H5P.QuestionSet",
   "author": "Amendor AS",
   "license": "cc-by-sa",
   "preloadedJs": [
diff --git a/views/questionset.ejs b/views/questionset.ejs
index 6d0278e..5219d42 100644
--- a/views/questionset.ejs
+++ b/views/questionset.ejs
@@ -9,7 +9,7 @@
   <div class="title"><%= title %></div>
   <% for (var i=0; i<questions.length; i++) { %>
     <div class="question-container" id="q-<%= i %>">
-      <div><%= questions[i].machineName %></div>
+      <div><%= questions[i].name %></div>
     </div>
   <% } %>
   <div class="qs-footer">