diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/controller/StartLesson.java b/webgoat-container/src/main/java/org/owasp/webgoat/controller/StartLesson.java
index 2a5ed9bae..736e10b8e 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/controller/StartLesson.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/controller/StartLesson.java
@@ -88,7 +88,7 @@ public class StartLesson {
         List<AbstractLesson> lessons = ws.getCourse()
                 .getLessons(ws, AbstractLesson.USER_ROLE);//TODO this should work with the security roles of Spring
         Optional<AbstractLesson> lesson = lessons.stream()
-                .filter(l -> l.getHtml().equals(lessonName))
+                .filter(l -> l.getId().equals(lessonName))
                 .findFirst();
         model.setViewName("lesson_content");
         model.addObject("lesson", lesson.get());
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java
index 1875103ea..0e22ee5aa 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java
@@ -626,7 +626,7 @@ public abstract class AbstractLesson extends Screen implements Comparable<Object
      * @return a {@link java.lang.String} object.
      */
     protected String getPath() {
-        return "#attack";
+        return "#lesson/";
     }
 
     /**
@@ -645,9 +645,10 @@ public abstract class AbstractLesson extends Screen implements Comparable<Object
         StringBuffer link = new StringBuffer(getPath());
 
         // mvc update:
-        return link
-                .append("/").append(getScreenId())
-                .append("/").append(getCategory().getRanking()).toString();
+//        return link
+//                .append("/").append(getScreenId())
+//                .append("/").append(getCategory().getRanking()).toString();
+        return link.append(getId()).toString();
     }
 
     /**
@@ -999,7 +1000,7 @@ public abstract class AbstractLesson extends Screen implements Comparable<Object
         return labelManager;
     }
 
-    public String getHtml() {
+    public String getId() {
         return "";
     }
 }
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/plugins/Plugin.java b/webgoat-container/src/main/java/org/owasp/webgoat/plugins/Plugin.java
index 3a4f55b05..7016bf4bf 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/plugins/Plugin.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/plugins/Plugin.java
@@ -83,7 +83,7 @@ public class Plugin {
                 final String category = (String) lessonYml.get("category");
                 final List<String> hints = (List<String>) lessonYml.get("hints");
                 final String title = (String) lessonYml.get("title");
-                final String html = (String) lessonYml.get("html");
+                final String html = (String) lessonYml.get("id");
                 this.ymlBasedLesson = new YmlBasedLesson(category, hints, title, html);
                 this.lesson = null;
             } catch (IOException e) {
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/plugins/YmlBasedLesson.java b/webgoat-container/src/main/java/org/owasp/webgoat/plugins/YmlBasedLesson.java
index 86e983b9b..e1498e484 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/plugins/YmlBasedLesson.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/plugins/YmlBasedLesson.java
@@ -41,13 +41,13 @@ public class YmlBasedLesson extends LessonAdapter {
     private final String category;
     private final List<String> hints;
     private final String title;
-    private final String html;
+    private final String id;
 
-    public YmlBasedLesson(String category, List<String> hints, String title, String html) {
+    public YmlBasedLesson(String category, List<String> hints, String title, String id) {
         this.category = category;
         this.hints = hints;
         this.title = title;
-        this.html = html;
+        this.id = id;
     }
 
     @Override
@@ -70,8 +70,8 @@ public class YmlBasedLesson extends LessonAdapter {
         return title;
     }
 
-    public String getHtml() {
-        return html;
+    public String getId() {
+        return id;
     }