diff --git a/src/main/java/org/isaqb/asciidoc/Main.java b/src/main/java/org/isaqb/asciidoc/Main.java
index 7a7ab22..456e4db 100644
--- a/src/main/java/org/isaqb/asciidoc/Main.java
+++ b/src/main/java/org/isaqb/asciidoc/Main.java
@@ -50,25 +50,30 @@ public static void main(final String[] args) {
         language,
         projectVersion,
         curriculumFileName,
-        versionDate
+        versionDate,
+        curriculumFileName
     ));
-    convertInLanguage(
-        ENGLISH,
+
+    convertInFormat(HTML,
         projectVersion,
         INDEX_FILE_NAME,
-        versionDate);
+        versionDate,
+        ENGLISH,
+        curriculumFileName);
   }
 
   private static void convertInLanguage(
       final String language,
       final String projectVersion,
       final String curriculumFileName,
-      final String versionDate) {
+      final String versionDate,
+      final String curriculumName) {
     Stream.of(FORMATS).forEach(format -> convertInFormat(
         format, projectVersion,
         curriculumFileName,
         versionDate,
-        language
+        language,
+        curriculumName
     ));
   }
 
@@ -77,11 +82,12 @@ private static void convertInFormat(
       final String projectVersion,
       final String curriculumFileName,
       final String versionDate,
-      final String language) {
+      final String language,
+      final String curriculumName) {
     try (final Asciidoctor asciidoctor = create()) {
       final Attributes attributes = toAttributes(
           projectVersion,
-          curriculumFileName,
+          curriculumName,
           versionDate,
           language);
       asciidoctor.convertDirectory(
@@ -98,7 +104,9 @@ private static void convertInFormat(
               .toDir(new File(OUTPUT_DIR))
               .safe(SafeMode.UNSAFE)
               .build());
+
       if (!INDEX_FILE_NAME.equals(curriculumFileName)) {
+        // rename only if we're not creating the index file.
         renameResultAccordingToLanguage(curriculumFileName, format, language);
       }
     }