diff --git a/README.md b/README.md
index 4d5c081a0..8ecd09f1a 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,8 @@ Technically, after reading an article from a ZIM file, there is a need to "injec
 
 This application is released under the GPL v3 license. See http://www.gnu.org/licenses/ or the included LICENSE-GPLv3.txt file
 The source code can be found at https://github.com/kiwix/kiwix-html5
-Unit tests can be run by opening tests.html file on Firefox.
+Unit tests can be run by opening tests.html file on Firefox (or Chromium/Chrome with some tweaks).
 
-The first versions of this application were originally part of the Evopedia project: http://www.evopedia.info (now discontinued)
-These first versions were targeting Firefox OS (now discontinued too : we're not lucky ;-) ).
\ No newline at end of file
+The first versions of this application were originally part of the Evopedia project: http://www.evopedia.info (now discontinued). There was a "articles nearby" feature, that was able to find articles around your location. It has been deleted from the source code with everything related to Evopedia (but still in git history in versions<=2.0.0)
+These first versions were targeting Firefox OS (now discontinued too : we're not lucky ;-) ).
+Some Phonegap/Cordova port had been started but never finished (see in git history in versions<=2.0.0).
\ No newline at end of file
diff --git a/browser-tests/nightwatch_runner.js b/browser-tests/nightwatch_runner.js
index f9273b369..ead9590be 100644
--- a/browser-tests/nightwatch_runner.js
+++ b/browser-tests/nightwatch_runner.js
@@ -16,14 +16,14 @@ module.exports = {
             .execute(function() {
                 window.setRemoteArchive('https://kiwix.github.io/kiwix-html5/tests/wikipedia_en_ray_charles_2015-06.zim');
             })
-            .waitForElementVisible('#formTitleSearch', 20000)
-            .waitForElementVisible('#searchTitles', 20000)
+            .waitForElementVisible('#formArticleSearch', 20000)
+            .waitForElementVisible('#searchArticles', 20000)
             .setValue('#prefix', "Ray")
-            .click('#searchTitles')
-            .waitForElementVisible('#titleList', 20000)
+            .click('#searchArticles')
+            .waitForElementVisible('#articleList', 20000)
             .useXpath()
-            .waitForElementVisible("//div[@id='titleList']/a[text()='Ray Charles']", 20000)
-            .click("//div[@id='titleList']/a[text()='Ray Charles']")
+            .waitForElementVisible("//div[@id='articleList']/a[text()='Ray Charles']", 20000)
+            .click("//div[@id='articleList']/a[text()='Ray Charles']")
             .useCss()
             .frame('articleContent')
                 .waitForElementPresent('#mweQ', 2000000)
diff --git a/service-worker.js b/service-worker.js
index 5b5d40734..8a4dce1ff 100644
--- a/service-worker.js
+++ b/service-worker.js
@@ -99,39 +99,39 @@ function fetchEventListener(event) {
             console.log('Asking app.js for a content', event.request.url);
             event.respondWith(new Promise(function(resolve, reject) {
                 var nameSpace;
-                var titleName;
-                var titleNameWithNameSpace;
+                var title;
+                var titleWithNameSpace;
                 var contentType;
                 if (regexpContentUrlWithoutNamespace.test(event.request.url)) {
                     // When the request URL is in the same folder,
                     // it means it's a link to an article (namespace A)
                     var regexpResult = regexpContentUrlWithoutNamespace.exec(event.request.url);
                     nameSpace = 'A';
-                    titleName = regexpResult[1];
+                    title = regexpResult[1];
                 } else {
                     var regexpResult = regexpContentUrlWithNamespace.exec(event.request.url);
                     nameSpace = regexpResult[1];
-                    titleName = regexpResult[2];
+                    title = regexpResult[2];
                 }
 
                 // The namespace defines the type of content. See http://www.openzim.org/wiki/ZIM_file_format#Namespaces
                 // TODO : read the contentType from the ZIM file instead of hard-coding it here
                 if (nameSpace === 'A') {
-                    console.log("It's an article : " + titleName);
+                    console.log("It's an article : " + title);
                     contentType = 'text/html';
                 }
                 else if (nameSpace === 'I' || nameSpace === 'J') {
-                    console.log("It's an image : " + titleName);
-                    if (regexpJPEG.test(titleName)) {
+                    console.log("It's an image : " + title);
+                    if (regexpJPEG.test(title)) {
                         contentType = 'image/jpeg';
                     }
-                    else if (regexpPNG.test(titleName)) {
+                    else if (regexpPNG.test(title)) {
                         contentType = 'image/png';
                     }
                 }
                 else if (nameSpace === '-') {
-                    console.log("It's a layout dependency : " + titleName);
-                    if (regexpJS.test(titleName)) {
+                    console.log("It's a layout dependency : " + title);
+                    if (regexpJS.test(title)) {
                         contentType = 'text/javascript';
                         var responseInit = {
                             status: 200,
@@ -147,21 +147,21 @@ function fetchEventListener(event) {
                         resolve(httpResponse);
                         return;
                     }
-                    else if (regexpCSS.test(titleName)) {
+                    else if (regexpCSS.test(title)) {
                         contentType = 'text/css';
                     }
                 }
 
                 // We need to remove the potential parameters in the URL
-                titleName = removeUrlParameters(decodeURIComponent(titleName));
+                title = removeUrlParameters(decodeURIComponent(title));
 
-                titleNameWithNameSpace = nameSpace + '/' + titleName;
+                titleWithNameSpace = nameSpace + '/' + title;
 
                 // Let's instanciate a new messageChannel, to allow app.s to give us the content
                 var messageChannel = new MessageChannel();
                 messageChannel.port1.onmessage = function(event) {
                     if (event.data.action === 'giveContent') {
-                        console.log('content message received for ' + titleNameWithNameSpace, event.data);
+                        console.log('content message received for ' + titleWithNameSpace, event.data);
                         var responseInit = {
                             status: 200,
                             statusText: 'OK',
@@ -172,16 +172,16 @@ function fetchEventListener(event) {
 
                         var httpResponse = new Response(event.data.content, responseInit);
 
-                        console.log('ServiceWorker responding to the HTTP request for ' + titleNameWithNameSpace + ' (size=' + event.data.content.length + ' octets)' , httpResponse);
+                        console.log('ServiceWorker responding to the HTTP request for ' + titleWithNameSpace + ' (size=' + event.data.content.length + ' octets)' , httpResponse);
                         resolve(httpResponse);
                     }
                     else {
-                        console.log('Invalid message received from app.js for ' + titleNameWithNameSpace, event.data);
+                        console.log('Invalid message received from app.js for ' + titleWithNameSpace, event.data);
                         reject(event.data);
                     }
                 };
-                console.log('Eventlistener added to listen for an answer to ' + titleNameWithNameSpace);
-                outgoingMessagePort.postMessage({'action': 'askForContent', 'titleName': titleNameWithNameSpace}, [messageChannel.port2]);
+                console.log('Eventlistener added to listen for an answer to ' + titleWithNameSpace);
+                outgoingMessagePort.postMessage({'action': 'askForContent', 'title': titleWithNameSpace}, [messageChannel.port2]);
                 console.log('Message sent to app.js through outgoingMessagePort');
             }));
         }
diff --git a/tests/tests.js b/tests/tests.js
index 603651662..91113098e 100644
--- a/tests/tests.js
+++ b/tests/tests.js
@@ -110,10 +110,10 @@ define(['jquery', 'zimArchive', 'zimDirEntry', 'util', 'utf8'],
             assert.equal(util.ucEveryFirstLetter(testString3), "Le Couvre-Chef Est Sur Le Porte-Manteaux", "The first letter of every word should be upper-case");
             assert.equal(util.ucFirstLetter(testString4), "Épée", "The first letter should be upper-case (with accent)");
         });
-        QUnit.test("check remove duplicates of an array of title objects", function(assert) {
+        QUnit.test("check remove duplicates of an array of dirEntry objects", function(assert) {
             var array = [{title:"a"}, {title:"b"}, {title:"c"}, {title:"a"}, {title:"c"}, {title:"d"}];
             var expectedArray = [{title:"a"}, {title:"b"}, {title:"c"}, {title:"d"}];
-            assert.deepEqual(util.removeDuplicateTitlesInArray(array), expectedArray, "Duplicates should be removed from the array");
+            assert.deepEqual(util.removeDuplicateTitlesInDirEntryArray(array), expectedArray, "Duplicates should be removed from the array");
         });
         
         QUnit.module("ZIM initialisation");
@@ -121,13 +121,13 @@ define(['jquery', 'zimArchive', 'zimDirEntry', 'util', 'utf8'],
             assert.ok(localZimArchive.isReady() === true, "ZIM archive should be set as ready");
         });
                 
-        QUnit.module("zim_title_search_and_read");
+        QUnit.module("zim_direntry_search_and_read");
         QUnit.test("check DirEntry.fromStringId 'A Fool for You'", function(assert) {
             var done = assert.async();
             var aFoolForYouDirEntry = zimDirEntry.DirEntry.fromStringId(localZimArchive._file, "5856|7|A|0|2|A_Fool_for_You.html|A Fool for You|false|undefined");
 
             assert.expect(2);
-            var callbackFunction = function(title, htmlArticle) {
+            var callbackFunction = function(dirEntry, htmlArticle) {
                 assert.ok(htmlArticle && htmlArticle.length > 0, "Article not empty");
                 // Remove new lines
                 htmlArticle = htmlArticle.replace(/[\r\n]/g, " ");
@@ -136,51 +136,51 @@ define(['jquery', 'zimArchive', 'zimDirEntry', 'util', 'utf8'],
             };
             localZimArchive.readArticle(aFoolForYouDirEntry, callbackFunction);
         });
-        QUnit.test("check findTitlesWithPrefix 'A'", function(assert) {
+        QUnit.test("check findDirEntriesWithPrefix 'A'", function(assert) {
             var done = assert.async();            
             assert.expect(2);
-            var callbackFunction = function(titleList) {
-                assert.ok(titleList && titleList.length === 5, "Article list with 5 results");
-                var firstTitle = titleList[0];
-                assert.equal(firstTitle.title , 'A Fool for You', 'First result should be "A Fool for You"');
+            var callbackFunction = function(dirEntryList) {
+                assert.ok(dirEntryList && dirEntryList.length === 5, "Article list with 5 results");
+                var firstDirEntry = dirEntryList[0];
+                assert.equal(firstDirEntry.title , 'A Fool for You', 'First result should be "A Fool for You"');
                 done();
             };
-            localZimArchive.findTitlesWithPrefix('A', 5, callbackFunction);
+            localZimArchive.findDirEntriesWithPrefix('A', 5, callbackFunction);
         });
-        QUnit.test("check findTitlesWithPrefix 'a'", function(assert) {
+        QUnit.test("check findDirEntriesWithPrefix 'a'", function(assert) {
             var done = assert.async();            
             assert.expect(2);
-            var callbackFunction = function(titleList) {
-                assert.ok(titleList && titleList.length === 5, "Article list with 5 results");
-                var firstTitle = titleList[0];
-                assert.equal(firstTitle.title , 'A Fool for You', 'First result should be "A Fool for You"');
+            var callbackFunction = function(dirEntryList) {
+                assert.ok(dirEntryList && dirEntryList.length === 5, "Article list with 5 results");
+                var firstDirEntry = dirEntryList[0];
+                assert.equal(firstDirEntry.title , 'A Fool for You', 'First result should be "A Fool for You"');
                 done();
             };
-            localZimArchive.findTitlesWithPrefix('a', 5, callbackFunction);
+            localZimArchive.findDirEntriesWithPrefix('a', 5, callbackFunction);
         });
-        QUnit.test("check findTitlesWithPrefix 'blues brothers'", function(assert) {
+        QUnit.test("check findDirEntriesWithPrefix 'blues brothers'", function(assert) {
             var done = assert.async();
             assert.expect(2);
-            var callbackFunction = function(titleList) {
-                assert.ok(titleList && titleList.length === 3, "Article list with 3 result");
-                var firstTitle = titleList[0];
-                assert.equal(firstTitle.title , 'Blues Brothers (film)', 'First result should be "Blues Brothers (film)"');
+            var callbackFunction = function(dirEntryList) {
+                assert.ok(dirEntryList && dirEntryList.length === 3, "Article list with 3 result");
+                var firstDirEntry = dirEntryList[0];
+                assert.equal(firstDirEntry.title , 'Blues Brothers (film)', 'First result should be "Blues Brothers (film)"');
                 done();
             };
-            localZimArchive.findTitlesWithPrefix('blues brothers', 5, callbackFunction);
+            localZimArchive.findDirEntriesWithPrefix('blues brothers', 5, callbackFunction);
         });
         QUnit.test("article '(The Night Time Is) The Right Time' correctly redirects to 'Night Time Is the Right Time'", function(assert) {
             var done = assert.async();
             assert.expect(6);
-            localZimArchive.getTitleByName("A/(The_Night_Time_Is)_The_Right_Time.html").then(function(title) {
-                assert.ok(title !== null, "Title found");
-                if (title !== null) {
-                    assert.ok(title.isRedirect(), "Title is a redirect.");
-                    assert.equal(title.name(), "(The Night Time Is) The Right Time", "Correct redirect title name.");
-                    localZimArchive.resolveRedirect(title, function(title) {
-                        assert.ok(title !== null, "Title found");
-                        assert.ok(!title.isRedirect(), "Title is not a redirect.");
-                        assert.equal(title.name(), "Night Time Is the Right Time", "Correct redirected title name.");
+            localZimArchive.getDirEntryByTitle("A/(The_Night_Time_Is)_The_Right_Time.html").then(function(dirEntry) {
+                assert.ok(dirEntry !== null, "DirEntry found");
+                if (dirEntry !== null) {
+                    assert.ok(dirEntry.isRedirect(), "DirEntry is a redirect.");
+                    assert.equal(dirEntry.title, "(The Night Time Is) The Right Time", "Correct redirect title name.");
+                    localZimArchive.resolveRedirect(dirEntry, function(dirEntry) {
+                        assert.ok(dirEntry !== null, "DirEntry found");
+                        assert.ok(!dirEntry.isRedirect(), "DirEntry is not a redirect.");
+                        assert.equal(dirEntry.title, "Night Time Is the Right Time", "Correct redirected title name.");
                         done();
                     });
                 } else {
@@ -191,15 +191,15 @@ define(['jquery', 'zimArchive', 'zimDirEntry', 'util', 'utf8'],
         QUnit.test("article 'Raelettes' correctly redirects to 'The Raelettes'", function(assert) {
             var done = assert.async();
             assert.expect(6);
-            localZimArchive.getTitleByName("A/Raelettes.html").then(function(title) {
-                assert.ok(title !== null, "Title found");
-                if (title !== null) {
-                    assert.ok(title.isRedirect(), "Title is a redirect.");
-                    assert.equal(title.name(), "Raelettes", "Correct redirect title name.");
-                    localZimArchive.resolveRedirect(title, function(title) {
-                        assert.ok(title !== null, "Title found");
-                        assert.ok(!title.isRedirect(), "Title is not a redirect.");
-                        assert.equal(title.name(), "The Raelettes", "Correct redirected title name.");
+            localZimArchive.getDirEntryByTitle("A/Raelettes.html").then(function(dirEntry) {
+                assert.ok(dirEntry !== null, "DirEntry found");
+                if (dirEntry !== null) {
+                    assert.ok(dirEntry.isRedirect(), "DirEntry is a redirect.");
+                    assert.equal(dirEntry.title, "Raelettes", "Correct redirect title name.");
+                    localZimArchive.resolveRedirect(dirEntry, function(dirEntry) {
+                        assert.ok(dirEntry !== null, "DirEntry found");
+                        assert.ok(!dirEntry.isRedirect(), "DirEntry is not a redirect.");
+                        assert.equal(dirEntry.title, "The Raelettes", "Correct redirected title name.");
                         done();
                     });
                 } else {
@@ -210,15 +210,15 @@ define(['jquery', 'zimArchive', 'zimDirEntry', 'util', 'utf8'],
         QUnit.test("article 'Bein Green' correctly redirects to 'Bein' Green", function(assert) {
             var done = assert.async();
             assert.expect(6);
-            localZimArchive.getTitleByName("A/Bein_Green.html").then(function(title) {
-                assert.ok(title !== null, "Title found");
-                if (title !== null) {
-                    assert.ok(title.isRedirect(), "Title is a redirect.");
-                    assert.equal(title.name(), "Bein Green", "Correct redirect title name.");
-                    localZimArchive.resolveRedirect(title, function(title) {
-                        assert.ok(title !== null, "Title found");
-                        assert.ok(!title.isRedirect(), "Title is not a redirect.");
-                        assert.equal(title.name(), "Bein' Green", "Correct redirected title name.");
+            localZimArchive.getDirEntryByTitle("A/Bein_Green.html").then(function(dirEntry) {
+                assert.ok(dirEntry !== null, "DirEntry found");
+                if (dirEntry !== null) {
+                    assert.ok(dirEntry.isRedirect(), "DirEntry is a redirect.");
+                    assert.equal(dirEntry.title, "Bein Green", "Correct redirect title name.");
+                    localZimArchive.resolveRedirect(dirEntry, function(dirEntry) {
+                        assert.ok(dirEntry !== null, "DirEntry found");
+                        assert.ok(!dirEntry.isRedirect(), "DirEntry is not a redirect.");
+                        assert.equal(dirEntry.title, "Bein' Green", "Correct redirected title name.");
                         done();
                     });
                 } else {
@@ -229,15 +229,15 @@ define(['jquery', 'zimArchive', 'zimDirEntry', 'util', 'utf8'],
         QUnit.test("article 'America, the Beautiful' correctly redirects to 'America the Beautiful'", function(assert) {
             var done = assert.async();
             assert.expect(6);
-            localZimArchive.getTitleByName("A/America,_the_Beautiful.html").then(function(title) {
-                assert.ok(title !== null, "Title found");
-                if (title !== null) {
-                    assert.ok(title.isRedirect(), "Title is a redirect.");
-                    assert.equal(title.name(), "America, the Beautiful", "Correct redirect title name.");
-                    localZimArchive.resolveRedirect(title, function(title) {
-                        assert.ok(title !== null, "Title found");
-                        assert.ok(!title.isRedirect(), "Title is not a redirect.");
-                        assert.equal(title.name(), "America the Beautiful", "Correct redirected title name.");
+            localZimArchive.getDirEntryByTitle("A/America,_the_Beautiful.html").then(function(dirEntry) {
+                assert.ok(dirEntry !== null, "DirEntry found");
+                if (dirEntry !== null) {
+                    assert.ok(dirEntry.isRedirect(), "DirEntry is a redirect.");
+                    assert.equal(dirEntry.title, "America, the Beautiful", "Correct redirect title name.");
+                    localZimArchive.resolveRedirect(dirEntry, function(dirEntry) {
+                        assert.ok(dirEntry !== null, "DirEntry found");
+                        assert.ok(!dirEntry.isRedirect(), "DirEntry is not a redirect.");
+                        assert.equal(dirEntry.title, "America the Beautiful", "Correct redirected title name.");
                         done();
                     });
                 } else {
@@ -248,11 +248,11 @@ define(['jquery', 'zimArchive', 'zimDirEntry', 'util', 'utf8'],
         QUnit.test("Image 'm/RayCharles_AManAndHisSoul.jpg' can be loaded", function(assert) {
             var done = assert.async();
             assert.expect(4);
-            localZimArchive.getTitleByName("I/m/RayCharles_AManAndHisSoul.jpg").then(function(title) {
-                assert.ok(title !== null, "Title found");
-                if (title !== null) {
-                    assert.equal(title.namespace +"/"+ title.url, "I/m/RayCharles_AManAndHisSoul.jpg", "URL is correct.");
-                    localZimArchive.readBinaryFile(title, function(title, data) {
+            localZimArchive.getDirEntryByTitle("I/m/RayCharles_AManAndHisSoul.jpg").then(function(dirEntry) {
+                assert.ok(dirEntry !== null, "DirEntry found");
+                if (dirEntry !== null) {
+                    assert.equal(dirEntry.namespace +"/"+ dirEntry.url, "I/m/RayCharles_AManAndHisSoul.jpg", "URL is correct.");
+                    localZimArchive.readBinaryFile(dirEntry, function(title, data) {
                         assert.equal(data.length, 4951, "Data length is correct.");
                         var beginning = new Uint8Array([255, 216, 255, 224, 0, 16, 74, 70,
                                                          73, 70, 0, 1, 1, 0, 0, 1]);
@@ -268,11 +268,11 @@ define(['jquery', 'zimArchive', 'zimDirEntry', 'util', 'utf8'],
             var done = assert.async();
             
             assert.expect(4);
-            localZimArchive.getTitleByName("-/s/style.css").then(function(title) {
-                assert.ok(title !== null, "Title found");
-                if (title !== null) {
-                    assert.equal(title.namespace +"/"+ title.url, "-/s/style.css", "URL is correct.");
-                    localZimArchive.readBinaryFile(title, function(title, data) {
+            localZimArchive.getDirEntryByTitle("-/s/style.css").then(function(dirEntry) {
+                assert.ok(dirEntry !== null, "DirEntry found");
+                if (dirEntry !== null) {
+                    assert.equal(dirEntry.namespace +"/"+ dirEntry.url, "-/s/style.css", "URL is correct.");
+                    localZimArchive.readBinaryFile(dirEntry, function(dirEntry, data) {
                         assert.equal(data.length, 104495, "Data length is correct.");
                         data = utf8.parse(data);
                         var beginning = "\n/* start http://en.wikipedia.org/w/load.php?debug=false&lang=en&modules=site&only=styles&skin=vector";
@@ -287,11 +287,11 @@ define(['jquery', 'zimArchive', 'zimDirEntry', 'util', 'utf8'],
         QUnit.test("Javascript '-/j/local.js' can be loaded", function(assert) {
             var done = assert.async();
             assert.expect(4);
-            localZimArchive.getTitleByName("-/j/local.js").then(function(title) {
-                assert.ok(title !== null, "Title found");
-                if (title !== null) {
-                    assert.equal(title.namespace +"/"+ title.url, "-/j/local.js", "URL is correct.");
-                    localZimArchive.readBinaryFile(title, function(title, data) {
+            localZimArchive.getDirEntryByTitle("-/j/local.js").then(function(dirEntry) {
+                assert.ok(dirEntry !== null, "DirEntry found");
+                if (dirEntry !== null) {
+                    assert.equal(dirEntry.namespace +"/"+ dirEntry.url, "-/j/local.js", "URL is correct.");
+                    localZimArchive.readBinaryFile(dirEntry, function(dirEntry, data) {
                         assert.equal(data.length, 41, "Data length is correct.");
                         data = utf8.parse(data);
                         var beginning = "console.log( \"mw.loader";
@@ -307,12 +307,12 @@ define(['jquery', 'zimArchive', 'zimDirEntry', 'util', 'utf8'],
         QUnit.test("Split article 'A/Ray_Charles.html' can be loaded", function(assert) {
             var done = assert.async();
             assert.expect(6);
-            localZimArchive.getTitleByName("A/Ray_Charles.html").then(function(title) {
-                assert.ok(title !== null, "Title found");
-                if (title !== null) {
-                    assert.equal(title.namespace +"/"+ title.url, "A/Ray_Charles.html", "URL is correct.");
-                    localZimArchive.readArticle(title, function(titleName, data) {
-                        assert.equal(titleName, "Ray Charles", "Title is correct.");
+            localZimArchive.getDirEntryByTitle("A/Ray_Charles.html").then(function(dirEntry) {
+                assert.ok(dirEntry !== null, "Title found");
+                if (dirEntry !== null) {
+                    assert.equal(dirEntry.namespace +"/"+ dirEntry.url, "A/Ray_Charles.html", "URL is correct.");
+                    localZimArchive.readArticle(dirEntry, function(title, data) {
+                        assert.equal(title, "Ray Charles", "Title is correct.");
                         assert.equal(data.length, 157186, "Data length is correct.");
                         assert.equal(data.indexOf("the only true genius in show business"), 5535, "Specific substring at beginning found.");
                         assert.equal(data.indexOf("Random Access Memories"), 154107, "Specific substring at end found.");
@@ -324,28 +324,28 @@ define(['jquery', 'zimArchive', 'zimDirEntry', 'util', 'utf8'],
             });
         });
         
-        QUnit.module("zim_random_and_main_title");
-        QUnit.test("check that a random title is found", function(assert) {
+        QUnit.module("zim_random_and_main_article");
+        QUnit.test("check that a random article is found", function(assert) {
             var done = assert.async();
             assert.expect(2);
-            var callbackRandomTitleFound = function(title) {
-                assert.ok(title !== null, "One title should be found");
-                assert.ok(title.name() !== null, "The random title should have a name" );
+            var callbackRandomArticleFound = function(dirEntry) {
+                assert.ok(dirEntry !== null, "One DirEntry should be found");
+                assert.ok(dirEntry.title !== null, "The random DirEntry should have a title" );
                
                 done();
             };
-            localZimArchive.getRandomTitle(callbackRandomTitleFound);
+            localZimArchive.getRandomDirEntry(callbackRandomArticleFound);
         });
-        QUnit.test("check that the main title is found", function(assert) {
+        QUnit.test("check that the main article is found", function(assert) {
             var done = assert.async();
             assert.expect(2);
-            var callbackMainPageTitleFound = function(title) {
-                assert.ok(title !== null, "Main title should be found");
-                assert.equal(title.name(), "Summary", "The main title should be called Summary" );
+            var callbackMainPageArticleFound = function(dirEntry) {
+                assert.ok(dirEntry !== null, "Main DirEntry should be found");
+                assert.equal(dirEntry.title, "Summary", "The main DirEntry should be called Summary" );
                
                 done();
             };
-            localZimArchive.getMainPageTitle(callbackMainPageTitleFound);
+            localZimArchive.getMainPageDirEntry(callbackMainPageArticleFound);
         });
     };
 });
diff --git a/www/css/app.css b/www/css/app.css
index d4e14efd4..28ed033bc 100644
--- a/www/css/app.css
+++ b/www/css/app.css
@@ -59,7 +59,7 @@
     padding-left: 1px !important;
 }
 
-#searchingForTitles .floating {
+#searchingForArticles .floating {
     position: relative;
     z-index: 10;
     top: 20px;
diff --git a/www/index.html b/www/index.html
index 144e36ec0..5387e2341 100644
--- a/www/index.html
+++ b/www/index.html
@@ -66,13 +66,13 @@
 
 
                 <div class="container">
-                <form id="formTitleSearch">
+                <form id="formArticleSearch">
                     <div class="row">
                         <span class="nopadding col-md-offset-1 col-sm-offset-1 col-md-8 col-sm-8 col-xs-7">
                             <span class="input-group">
                                 <input type="search" id="prefix" placeholder="Search..." class="form-control" />
                                 <span class="input-group-btn">
-                                    <a class="btn btn-default" id="searchTitles"><span class="glyphicon glyphicon-search"></span></a>
+                                    <a class="btn btn-default" id="searchArticles"><span class="glyphicon glyphicon-search"></span></a>
                                 </span>
                             </span>
                         </span>
@@ -82,7 +82,7 @@
                             </span>
                         </span>
                     </div>
-                    <div id="searchingForTitles" class="floating" style="display: none;">
+                    <div id="searchingForArticles" class="floating" style="display: none;">
                         <img src="img/spinner.gif" alt="Please wait..." />
                     </div>
                 </form>
@@ -223,15 +223,9 @@ <h2>Expert settings</h2>
                 </div>
 
                 <!-- List of articles matching the typed prefix -->
-                <div id="titleListWithHeader" class="container">
-                    <span id="titleListHeaderMessage"></span>
-                    <span id="suggestEnlargeMaxDistance" style="display: none;">
-                        &nbsp;You can <a id="btnEnlargeMaxDistance">look more far away</a>
-                    </span>
-                    <span id="suggestReduceMaxDistance" style="display: none;">
-                        &nbsp;You can <a id="btnReduceMaxDistance">look closer</a> to your location
-                    </span>
-                    <div id="titleList" class="list-group">
+                <div id="articleListWithHeader" class="container">
+                    <span id="articleListHeaderMessage"></span>
+                    <div id="articleList" class="list-group">
                     </div>
                 </div>
                 <div id="readingArticle" style="display: none;" class="container">
diff --git a/www/js/app.js b/www/js/app.js
index c71c62bc8..416431572 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -39,7 +39,7 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
     };
     
     /**
-     * Maximum number of titles to display in a search
+     * Maximum number of articles to display in a search
      * @type Integer
      */
     var MAX_SEARCH_RESULT_SIZE = 50;
@@ -55,7 +55,7 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
     function resizeIFrame() {
         var height = $(window).outerHeight()
                 - $("#top").outerHeight(true)
-                - $("#titleListWithHeader").outerHeight(true)
+                - $("#articleListWithHeader").outerHeight(true)
                 // TODO : this 5 should be dynamically computed, and not hard-coded
                 - 5;
         $(".articleIFrame").css("height", height + "px");
@@ -64,9 +64,9 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
     $(window).resize(resizeIFrame);
     
     // Define behavior of HTML elements
-    $('#searchTitles').on('click', function(e) {
+    $('#searchArticles').on('click', function(e) {
         pushBrowserHistoryState(null, $('#prefix').val());
-        searchTitlesFromPrefix($('#prefix').val());
+        searchDirEntriesFromPrefix($('#prefix').val());
         $("#welcomeText").hide();
         $("#readingArticle").hide();
         $("#articleContent").hide();
@@ -74,8 +74,8 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
             $('#navbarToggle').click();
         }
     });
-    $('#formTitleSearch').on('submit', function(e) {
-        document.getElementById("searchTitles").click();
+    $('#formArticleSearch').on('submit', function(e) {
+        document.getElementById("searchArticles").click();
         return false;
     });
     $('#prefix').on('keyup', function(e) {
@@ -87,10 +87,10 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
         $('#prefix').val("");
         goToRandomArticle();
         $("#welcomeText").hide();
-        $('#titleList').hide();
-        $('#titleListHeaderMessage').hide();
+        $('#articleList').hide();
+        $('#articleListHeaderMessage').hide();
         $("#readingArticle").hide();
-        $('#searchingForTitles').hide();
+        $('#searchingForArticles').hide();
         if ($('#navbarToggle').is(":visible") && $('#liHomeNav').is(':visible')) {
             $('#navbarToggle').click();
         }
@@ -129,20 +129,20 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
         // Show the selected content in the page
         $('#about').hide();
         $('#configuration').hide();
-        $('#formTitleSearch').show();
+        $('#formArticleSearch').show();
         $("#welcomeText").show();
-        $('#titleList').show();
-        $('#titleListHeaderMessage').show();
+        $('#articleList').show();
+        $('#articleListHeaderMessage').show();
         $('#articleContent').show();
         // Give the focus to the search field, and clean up the page contents
         $("#prefix").val("");
         $('#prefix').focus();
-        $("#titleList").empty();
-        $('#titleListHeaderMessage').empty();
+        $("#articleList").empty();
+        $('#articleListHeaderMessage').empty();
         $("#readingArticle").hide();
         $("#articleContent").hide();
         $("#articleContent").contents().empty();
-        $('#searchingForTitles').hide();
+        $('#searchingForArticles').hide();
         if (selectedArchive !== null && selectedArchive.isReady()) {
             $("#welcomeText").hide();
             goToMainArticle();
@@ -160,14 +160,14 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
         // Show the selected content in the page
         $('#about').hide();
         $('#configuration').show();
-        $('#formTitleSearch').hide();
+        $('#formArticleSearch').hide();
         $("#welcomeText").hide();
-        $('#titleList').hide();
-        $('#titleListHeaderMessage').hide();
+        $('#articleList').hide();
+        $('#articleListHeaderMessage').hide();
         $("#readingArticle").hide();
         $("#articleContent").hide();
         $('#articleContent').hide();
-        $('#searchingForTitles').hide();
+        $('#searchingForArticles').hide();
         refreshAPIStatus();
         return false;
     });
@@ -182,14 +182,14 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
         // Show the selected content in the page
         $('#about').show();
         $('#configuration').hide();
-        $('#formTitleSearch').hide();
+        $('#formArticleSearch').hide();
         $("#welcomeText").hide();
-        $('#titleList').hide();
-        $('#titleListHeaderMessage').hide();
+        $('#articleList').hide();
+        $('#articleListHeaderMessage').hide();
         $("#readingArticle").hide();
         $("#articleContent").hide();
         $('#articleContent').hide();
-        $('#searchingForTitles').hide();
+        $('#searchingForArticles').hide();
         return false;
     });
     $('input:radio[name=contentInjectionMode]').on('change', function(e) {
@@ -318,7 +318,7 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
             // If the focus is on the search field, we have to move it,
             // else the keyboard hides the message
             if ($("#prefix").is(":focus")) {
-                $("searchTitles").focus();
+                $("searchArticles").focus();
             }
             if (confirm("The 'Service Worker' mode is still UNSTABLE for now."
                 + " It happens that the application needs to be reinstalled (or the ServiceWorker manually removed)."
@@ -433,7 +433,7 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
     // Display the article when the user goes back in the browser history
     window.onpopstate = function(event) {
         if (event.state) {
-            var titleName = event.state.titleName;
+            var title = event.state.title;
             var titleSearch = event.state.titleSearch;
             
             $('#prefix').val("");
@@ -442,24 +442,24 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
             if ($('#navbarToggle').is(":visible") && $('#liHomeNav').is(':visible')) {
                 $('#navbarToggle').click();
             }
-            $('#searchingForTitles').hide();
+            $('#searchingForArticles').hide();
             $('#configuration').hide();
-            $('#titleList').hide();
-            $('#titleListHeaderMessage').hide();
+            $('#articleList').hide();
+            $('#articleListHeaderMessage').hide();
             $('#articleContent').contents().empty();
             
-            if (titleName && !(""===titleName)) {
-                goToArticle(titleName);
+            if (title && !(""===title)) {
+                goToArticle(title);
             }
             else if (titleSearch && !(""===titleSearch)) {
                 $('#prefix').val(titleSearch);
-                searchTitlesFromPrefix($('#prefix').val());
+                searchDirEntriesFromPrefix($('#prefix').val());
             }
         }
     };
     
     /**
-     * Populate the drop-down list of titles with the given list
+     * Populate the drop-down list of archives with the given list
      * @param {Array.<String>} archiveDirectories
      */
     function populateDropDownListOfArchives(archiveDirectories) {
@@ -598,7 +598,7 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
         window.timeoutKeyUpPrefix = window.setTimeout(function() {
             var prefix = $("#prefix").val();
             if (prefix && prefix.length>0) {
-                $('#searchTitles').click();
+                $('#searchArticles').click();
             }
         }
         ,500);
@@ -606,21 +606,21 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
 
 
     /**
-     * Search the index for titles that start with the given prefix (implemented
+     * Search the index for DirEntries with title that start with the given prefix (implemented
      * with a binary search inside the index file)
      * @param {String} prefix
      */
-    function searchTitlesFromPrefix(prefix) {
-        $('#searchingForTitles').show();
+    function searchDirEntriesFromPrefix(prefix) {
+        $('#searchingForArticles').show();
         $('#configuration').hide();
         $('#articleContent').contents().empty();
         if (selectedArchive !== null && selectedArchive.isReady()) {
-            selectedArchive.findTitlesWithPrefix(prefix.trim(), MAX_SEARCH_RESULT_SIZE, populateListOfTitles);
+            selectedArchive.findDirEntriesWithPrefix(prefix.trim(), MAX_SEARCH_RESULT_SIZE, populateListOfArticles);
         } else {
-            $('#searchingForTitles').hide();
+            $('#searchingForArticles').hide();
             // We have to remove the focus from the search field,
             // so that the keyboard does not stay above the message
-            $("#searchTitles").focus();
+            $("#searchArticles").focus();
             alert("Archive not set : please select an archive");
             $("#btnConfigure").click();
         }
@@ -628,79 +628,79 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
 
   
     /**
-     * Display the list of titles with the given array of titles
-     * @param {Array.<Title>} titleArray
-     * @param {Integer} maxTitles
+     * Display the list of articles with the given array of DirEntry
+     * @param {Array.<DirEntry>} dirEntryArray
+     * @param {Integer} maxArticles
      */
-    function populateListOfTitles(titleArray, maxTitles) {       
-        var titleListHeaderMessageDiv = $('#titleListHeaderMessage');
-        var nbTitles = 0;
-        if (titleArray) {
-            nbTitles = titleArray.length;
+    function populateListOfArticles(dirEntryArray, maxArticles) {       
+        var articleListHeaderMessageDiv = $('#articleListHeaderMessage');
+        var nbDirEntry = 0;
+        if (dirEntryArray) {
+            nbDirEntry = dirEntryArray.length;
         }
 
         var message;
-        if (maxTitles >= 0 && nbTitles >= maxTitles) {
-            message = maxTitles + " first titles below (refine your search).";
+        if (maxArticles >= 0 && nbDirEntry >= maxArticles) {
+            message = maxArticles + " first articles below (refine your search).";
         }
         else {
-            message = nbTitles + " titles found.";
+            message = nbDirEntry + " articles found.";
         }
-        if (nbTitles === 0) {
-            message = "No titles found.";
+        if (nbDirEntry === 0) {
+            message = "No articles found.";
         }
               
-        titleListHeaderMessageDiv.html(message);
+        articleListHeaderMessageDiv.html(message);
         
 
-        var titleListDiv = $('#titleList');
-        var titleListDivHtml = "";
-        for (var i = 0; i < titleArray.length; i++) {
-            var title = titleArray[i];
+        var articleListDiv = $('#articleList');
+        var articleListDivHtml = "";
+        for (var i = 0; i < dirEntryArray.length; i++) {
+            var dirEntry = dirEntryArray[i];
             
-            titleListDivHtml += "<a href='#' titleid='" + title.toStringId().replace(/'/g,"&apos;")
-                    + "' class='list-group-item'>" + title.getReadableName() + "</a>";
-        }
-        titleListDiv.html(titleListDivHtml);
-        $("#titleList a").on("click",handleTitleClick);
-        $('#searchingForTitles').hide();
-        $('#titleList').show();
-        $('#titleListHeaderMessage').show();
+            articleListDivHtml += "<a href='#' dirEntryId='" + dirEntry.toStringId().replace(/'/g,"&apos;")
+                    + "' class='list-group-item'>" + dirEntry.title + "</a>";
+        }
+        articleListDiv.html(articleListDivHtml);
+        $("#articleList a").on("click",handleTitleClick);
+        $('#searchingForArticles').hide();
+        $('#articleList').show();
+        $('#articleListHeaderMessage').show();
     }
     
     /**
-     * Handles the click on a title
+     * Handles the click on the title of an article in search results
      * @param {Event} event
      * @returns {Boolean}
      */
     function handleTitleClick(event) {       
-        var titleId = event.target.getAttribute("titleId");
-        $("#titleList").empty();
-        $('#titleListHeaderMessage').empty();
+        var dirEntryId = event.target.getAttribute("dirEntryId");
+        $("#articleList").empty();
+        $('#articleListHeaderMessage').empty();
         $("#prefix").val("");
-        findTitleFromTitleIdAndLaunchArticleRead(titleId);
-        var title = selectedArchive.parseTitleId(titleId);
-        pushBrowserHistoryState(title.url);
+        findDirEntryFromDirEntryIdAndLaunchArticleRead(dirEntryId);
+        var dirEntry = selectedArchive.parseDirEntryId(dirEntryId);
+        pushBrowserHistoryState(dirEntry.url);
         return false;
     }
     
 
     /**
-     * Creates an instance of title from given titleId (including resolving redirects),
+     * Creates an instance of DirEntry from given dirEntryId (including resolving redirects),
      * and call the function to read the corresponding article
-     * @param {String} titleId
+     * @param {String} dirEntryId
      */
-    function findTitleFromTitleIdAndLaunchArticleRead(titleId) {
+    function findDirEntryFromDirEntryIdAndLaunchArticleRead(dirEntryId) {
         if (selectedArchive.isReady()) {
-            var title = selectedArchive.parseTitleId(titleId);
-            $("#articleName").html(title.name());
+            var dirEntry = selectedArchive.parseDirEntryId(dirEntryId);
+            $("#articleName").html(dirEntry.title);
             $("#readingArticle").show();
             $("#articleContent").contents().html("");
-            if (title.isRedirect()) {
-                selectedArchive.resolveRedirect(title, readArticle);
+            if (dirEntry.isRedirect()) {
+                selectedArchive.resolveRedirect(dirEntry, readArticle);
             }
             else {
-                readArticle(title);
+                readArticle(dirEntry);
             }
         }
         else {
@@ -709,15 +709,15 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
     }
 
     /**
-     * Read the article corresponding to the given title
-     * @param {Title|DirEntry} title
+     * Read the article corresponding to the given dirEntry
+     * @param {DirEntry} dirEntry
      */
-    function readArticle(title) {
-        if (title.isRedirect()) {
-            selectedArchive.resolveRedirect(title, readArticle);
+    function readArticle(dirEntry) {
+        if (dirEntry.isRedirect()) {
+            selectedArchive.resolveRedirect(dirEntry, readArticle);
         }
         else {
-            selectedArchive.readArticle(title, displayArticleInForm);
+            selectedArchive.readArticle(dirEntry, displayArticleInForm);
         }
     }
     
@@ -736,24 +736,24 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
             console.log("the ServiceWorker sent a message on port1", event.data);
             if (event.data.action === "askForContent") {
                 console.log("we are asked for a content : let's try to answer to this message");
-                var titleName = event.data.titleName;
+                var title = event.data.title;
                 var messagePort = event.ports[0];
-                var readFile = function(title) {
-                    if (title === null) {
-                        console.error("Title " + titleName + " not found in archive.");
-                        messagePort.postMessage({'action': 'giveContent', 'titleName' : titleName, 'content': ''});
-                    } else if (title.isRedirect()) {
-                        selectedArchive.resolveRedirect(title, readFile);
+                var readFile = function(dirEntry) {
+                    if (dirEntry === null) {
+                        console.error("Title " + title + " not found in archive.");
+                        messagePort.postMessage({'action': 'giveContent', 'title' : title, 'content': ''});
+                    } else if (dirEntry.isRedirect()) {
+                        selectedArchive.resolveRedirect(dirEntry, readFile);
                     } else {
                         console.log("Reading binary file...");
-                        selectedArchive.readBinaryFile(title, function(readableTitleName, content) {
-                            messagePort.postMessage({'action': 'giveContent', 'titleName' : titleName, 'content': content});
+                        selectedArchive.readBinaryFile(dirEntry, function(readableTitle, content) {
+                            messagePort.postMessage({'action': 'giveContent', 'title' : title, 'content': content});
                             console.log("content sent to ServiceWorker");
                         });
                     }
                 };
-                selectedArchive.getTitleByName(titleName).then(readFile).fail(function() {
-                    messagePort.postMessage({'action': 'giveContent', 'titleName' : titleName, 'content': new UInt8Array()});
+                selectedArchive.getDirEntryByTitle(title).then(readFile).fail(function() {
+                    messagePort.postMessage({'action': 'giveContent', 'title' : title, 'content': new UInt8Array()});
                 });
             }
             else {
@@ -774,10 +774,10 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
      * Display the the given HTML article in the web page,
      * and convert links to javascript calls
      * NB : in some error cases, the given title can be null, and the htmlArticle contains the error message
-     * @param {Title|DirEntry} title
+     * @param {DirEntry} dirEntry
      * @param {String} htmlArticle
      */
-    function displayArticleInForm(title, htmlArticle) {
+    function displayArticleInForm(dirEntry, htmlArticle) {
         $("#readingArticle").hide();
         $("#articleContent").show();
         // Scroll the iframe to its top
@@ -853,14 +853,14 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
                 // We try to find its name (from an absolute or relative URL)
                 var imageMatch = image.attr("src").match(regexpImageUrl);
                 if (imageMatch) {
-                    var titleName = decodeURIComponent(imageMatch[1]);
-                    selectedArchive.getTitleByName(titleName).then(function(title) {
-                        selectedArchive.readBinaryFile(title, function (readableTitleName, content) {
+                    var title = decodeURIComponent(imageMatch[1]);
+                    selectedArchive.getDirEntryByTitle(title).then(function(dirEntry) {
+                        selectedArchive.readBinaryFile(dirEntry, function (readableTitle, content) {
                             // TODO : use the complete MIME-type of the image (as read from the ZIM file)
                             uiUtil.feedNodeWithBlob(image, 'src', content, 'image');
                         });
                     }).fail(function (e) {
-                        console.error("could not find title for image:" + titleName, e);
+                        console.error("could not find DirEntry for image:" + title, e);
                     });
                 }
             });
@@ -872,9 +872,9 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
                 var hrefMatch = link.attr("href").match(regexpMetadataUrl);
                 if (hrefMatch) {
                     // It's a CSS file contained in the ZIM file
-                    var titleName = uiUtil.removeUrlParameters(decodeURIComponent(hrefMatch[1]));
-                    selectedArchive.getTitleByName(titleName).then(function(title) {
-                        selectedArchive.readBinaryFile(title, function (readableTitleName, content) {
+                    var title = uiUtil.removeUrlParameters(decodeURIComponent(hrefMatch[1]));
+                    selectedArchive.getDirEntryByTitle(title).then(function(dirEntry) {
+                        selectedArchive.readBinaryFile(dirEntry, function (readableTitle, content) {
                             var cssContent = util.uintToString(content);
                             // For some reason, Firefox OS does not accept the syntax <link rel="stylesheet" href="data:text/css,...">
                             // So we replace the tag with a <style type="text/css">...</style>
@@ -899,7 +899,7 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
                             link.replaceWith(cssElement);
                         });
                     }).fail(function (e) {
-                        console.error("could not find title for CSS : " + titleName, e);
+                        console.error("could not find DirEntry for CSS : " + title, e);
                     });
                 }
             });
@@ -912,18 +912,18 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
                 // TODO check that the type of the script is text/javascript or application/javascript
                 if (srcMatch) {
                     // It's a Javascript file contained in the ZIM file
-                    var titleName = uiUtil.removeUrlParameters(decodeURIComponent(srcMatch[1]));
-                    selectedArchive.getTitleByName(titleName).then(function(title) {
-                        if (title === null)
-                            console.log("Error: js file not found: " + titleName);
+                    var title = uiUtil.removeUrlParameters(decodeURIComponent(srcMatch[1]));
+                    selectedArchive.getDirEntryByTitle(title).then(function(dirEntry) {
+                        if (dirEntry === null)
+                            console.log("Error: js file not found: " + title);
                         else
-                            selectedArchive.readBinaryFile(title, function (readableTitleName, content) {
+                            selectedArchive.readBinaryFile(dirEntry, function (readableTitle, content) {
                                 // TODO : I have to disable javascript for now
                                 // var jsContent = encodeURIComponent(util.uintToString(content));
                                 //script.attr("src", 'data:text/javascript;charset=UTF-8,' + jsContent);
                             });
                     }).fail(function (e) {
-                        console.error("could not find title for javascript : " + titleName, e);
+                        console.error("could not find DirEntry for javascript : " + title, e);
                     });
                 }
             });
@@ -934,17 +934,17 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
     /**
      * Changes the URL of the browser page, so that the user might go back to it
      * 
-     * @param {String} titleName
+     * @param {String} title
      * @param {String} titleSearch
      */
-    function pushBrowserHistoryState(titleName, titleSearch) {
+    function pushBrowserHistoryState(title, titleSearch) {
         var stateObj = {};
         var urlParameters;
         var stateLabel;
-        if (titleName && !(""===titleName)) {
-            stateObj.titleName = titleName;
-            urlParameters = "?title=" + titleName;
-            stateLabel = "Wikipedia Article : " + titleName;
+        if (title && !(""===title)) {
+            stateObj.title = title;
+            urlParameters = "?title=" + title;
+            stateLabel = "Wikipedia Article : " + title;
         }
         else if (titleSearch && !(""===titleSearch)) {
             stateObj.titleSearch = titleSearch;
@@ -960,35 +960,35 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
 
     /**
      * Replace article content with the one of the given title
-     * @param {String} titleName
+     * @param {String} title
      */
-    function goToArticle(titleName) {
-        selectedArchive.getTitleByName(titleName).then(function(title) {
-            if (title === null || title === undefined) {
+    function goToArticle(title) {
+        selectedArchive.getDirEntryByTitle(title).then(function(dirEntry) {
+            if (dirEntry === null || dirEntry === undefined) {
                 $("#readingArticle").hide();
-                alert("Article with title " + titleName + " not found in the archive");
+                alert("Article with title " + title + " not found in the archive");
             }
             else {
-                $("#articleName").html(titleName);
+                $("#articleName").html(title);
                 $("#readingArticle").show();
                 $('#articleContent').contents().find('body').html("");
-                readArticle(title);
+                readArticle(dirEntry);
             }
-        }).fail(function() { alert("Error reading title " + titleName); });
+        }).fail(function() { alert("Error reading article with title " + title); });
     }
     
     function goToRandomArticle() {
-        selectedArchive.getRandomTitle(function(title) {
-            if (title === null || title === undefined) {
+        selectedArchive.getRandomDirEntry(function(dirEntry) {
+            if (dirEntry === null || dirEntry === undefined) {
                 alert("Error finding random article.");
             }
             else {
-                if (title.namespace === 'A') {
-                    $("#articleName").html(title.name());
-                    pushBrowserHistoryState(title.url);
+                if (dirEntry.namespace === 'A') {
+                    $("#articleName").html(dirEntry.title);
+                    pushBrowserHistoryState(dirEntry.url);
                     $("#readingArticle").show();
                     $('#articleContent').contents().find('body').html("");
-                    readArticle(title);
+                    readArticle(dirEntry);
                 }
                 else {
                     // If the random title search did not end up on an article,
@@ -1000,17 +1000,17 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
     }
     
     function goToMainArticle() {
-        selectedArchive.getMainPageTitle(function(title) {
-            if (title === null || title === undefined) {
+        selectedArchive.getMainPageDirEntry(function(dirEntry) {
+            if (dirEntry === null || dirEntry === undefined) {
                 console.error("Error finding main article.");
             }
             else {
-                if (title.namespace === 'A') {
-                    $("#articleName").html(title.name());
-                    pushBrowserHistoryState(title.url);
+                if (dirEntry.namespace === 'A') {
+                    $("#articleName").html(dirEntry.title);
+                    pushBrowserHistoryState(dirEntry.url);
                     $("#readingArticle").show();
                     $('#articleContent').contents().find('body').html("");
-                    readArticle(title);
+                    readArticle(dirEntry);
                 }
                 else {
                     console.error("The main page of this archive does not seem to be an article");
diff --git a/www/js/lib/util.js b/www/js/lib/util.js
index 4b6b8d8de..759b77648 100644
--- a/www/js/lib/util.js
+++ b/www/js/lib/util.js
@@ -78,16 +78,16 @@ define(['q'], function(q) {
     }
     
     /**
-     * Generates an array of Titles, where all duplicates have been removed
-     * (it also sorts the titles)
+     * Generates an array of DirEntry, where all duplicates (same title) have been removed
+     * (it also sorts them on their title)
      * 
-     * @param {Array.<Title>} array of Titles
-     * @returns {Array.<Title>} same array of Titles, without duplicates
+     * @param {Array.<DirEntry>} array of DirEntry
+     * @returns {Array.<DirEntry>} same array of DirEntry, without duplicates
      */
-    function removeDuplicateTitlesInArray(array) {
-        array.sort(function(titleA, titleB) {
-            if (titleA.title < titleB.title) return -1;
-            if (titleA.title > titleB.title) return 1;
+    function removeDuplicateTitlesInDirEntryArray(array) {
+        array.sort(function(dirEntryA, dirEntryB) {
+            if (dirEntryA.title < dirEntryB.title) return -1;
+            if (dirEntryA.title > dirEntryB.title) return 1;
             return 0;
         });
         for(var i = 1; i < array.length; ){
@@ -106,8 +106,8 @@ define(['q'], function(q) {
      * It is optimized for small arrays.
      * Source : http://codereview.stackexchange.com/questions/60128/removing-duplicates-from-an-array-quickly
      * 
-     * @param {Array.<Title>} array of String
-     * @returns {Array.<Title>} same array of Strings, without duplicates
+     * @param {Array} array of String
+     * @returns {Array} same array of Strings, without duplicates
      */
     function removeDuplicateStringsInSmallArray(array) {
         var unique = [];
@@ -316,7 +316,7 @@ define(['q'], function(q) {
         ucFirstLetter: ucFirstLetter,
         lcFirstLetter: lcFirstLetter,
         ucEveryFirstLetter: ucEveryFirstLetter,
-        removeDuplicateTitlesInArray: removeDuplicateTitlesInArray,
+        removeDuplicateTitlesInDirEntryArray: removeDuplicateTitlesInDirEntryArray,
         removeDuplicateStringsInSmallArray: removeDuplicateStringsInSmallArray,
         readIntegerFrom4Bytes: readIntegerFrom4Bytes,
         readIntegerFrom2Bytes : readIntegerFrom2Bytes,
diff --git a/www/js/lib/zimArchive.js b/www/js/lib/zimArchive.js
index ee93bd4d3..49db418cf 100644
--- a/www/js/lib/zimArchive.js
+++ b/www/js/lib/zimArchive.js
@@ -112,36 +112,33 @@ define(['zimfile', 'zimDirEntry', 'util', 'utf8'],
     };
     
     /**
-     * Looks for the title of the main page
-     * @param {callbackTitle} callback
-     * @returns {Promise} that resolves to the Title
+     * Looks for the DirEntry of the main page
+     * @param {callbackDirEntry} callback
+     * @returns {Promise} that resolves to the DirEntry
      */
-    ZIMArchive.prototype.getMainPageTitle = function(callback) {
+    ZIMArchive.prototype.getMainPageDirEntry = function(callback) {
         if (this.isReady()) {
             var mainPageUrlIndex = this._file.mainPage;
-            var that=this;
-            this._file.dirEntryByUrlIndex(mainPageUrlIndex).then(function(dirEntry){
-                return that._dirEntryToTitleObject(dirEntry);
-            }).then(callback);
+            this._file.dirEntryByUrlIndex(mainPageUrlIndex).then(callback);
         }
     };
 
     /**
      * 
-     * @param {String} titleId
+     * @param {String} dirEntryId
      * @returns {DirEntry}
      */
-    ZIMArchive.prototype.parseTitleId = function(titleId) {
-        return zimDirEntry.DirEntry.fromStringId(this._file, titleId);
+    ZIMArchive.prototype.parseDirEntryId = function(dirEntryId) {
+        return zimDirEntry.DirEntry.fromStringId(this._file, dirEntryId);
     };
     
     /**
-     * @callback callbackTitleList
-     * @param {Array.<Title>} titleArray Array of Titles found
+     * @callback callbackDirEntryList
+     * @param {Array.<DirEntry>} dirEntryArray Array of DirEntries found
      */
 
     /**
-     * Look for titles starting with the given prefix.
+     * Look for DirEntries with title starting with the given prefix.
      * For now, ZIM titles are case sensitive.
      * So, as workaround, we try several variants of the prefix to find more results.
      * This should be enhanced when the ZIM format will be modified to store normalized titles
@@ -149,21 +146,21 @@ define(['zimfile', 'zimDirEntry', 'util', 'utf8'],
      * 
      * @param {String} prefix
      * @param {Integer} resultSize
-     * @param {callbackTitleList} callback
+     * @param {callbackDirEntryList} callback
      */
-    ZIMArchive.prototype.findTitlesWithPrefix = function(prefix, resultSize, callback) {
+    ZIMArchive.prototype.findDirEntriesWithPrefix = function(prefix, resultSize, callback) {
         var that = this;
         var prefixVariants = util.removeDuplicateStringsInSmallArray([prefix, util.ucFirstLetter(prefix), util.lcFirstLetter(prefix), util.ucEveryFirstLetter(prefix)]);
-        var titles = [];
+        var dirEntries = [];
         function searchNextVariant() {
-            if (prefixVariants.length === 0 || titles.length >= resultSize) {
-                callback(titles);
+            if (prefixVariants.length === 0 || dirEntries.length >= resultSize) {
+                callback(dirEntries);
                 return;
             }
             var prefix = prefixVariants[0];
             prefixVariants = prefixVariants.slice(1);
-            that.findTitlesWithPrefixCaseSensitive(prefix, resultSize - titles.length, function (newTitles) {
-                titles.push.apply(titles, newTitles);
+            that.findDirEntriesWithPrefixCaseSensitive(prefix, resultSize - dirEntries.length, function (newDirEntries) {
+                dirEntries.push.apply(dirEntries, newDirEntries);
                 searchNextVariant();
             });
         }
@@ -171,13 +168,13 @@ define(['zimfile', 'zimDirEntry', 'util', 'utf8'],
     };
     
     /**
-     * Look for titles starting with the given prefix (case-sensitive)
+     * Look for DirEntries with title starting with the given prefix (case-sensitive)
      * 
      * @param {String} prefix
      * @param {Integer} resultSize
-     * @param {callbackTitleList} callback
+     * @param {callbackDirEntryList} callback
      */
-    ZIMArchive.prototype.findTitlesWithPrefixCaseSensitive = function(prefix, resultSize, callback) {
+    ZIMArchive.prototype.findDirEntriesWithPrefixCaseSensitive = function(prefix, resultSize, callback) {
         var that = this;
         util.binarySearch(0, this._file.articleCount, function(i) {
             return that._file.dirEntryByTitleIndex(i).then(function(dirEntry) {
@@ -190,45 +187,32 @@ define(['zimfile', 'zimDirEntry', 'util', 'utf8'],
                 return prefix <= dirEntry.title ? -1 : 1;
             });
         }, true).then(function(firstIndex) {
-            var titles = [];
-            var addTitles = function(index) {
+            var dirEntries = [];
+            var addDirEntries = function(index) {
                 if (index >= firstIndex + resultSize || index >= that._file.articleCount)
-                    return titles;
+                    return dirEntries;
                 return that._file.dirEntryByTitleIndex(index).then(function(dirEntry) {
                     if (dirEntry.title.slice(0, prefix.length) === prefix && dirEntry.namespace === "A")
-                        titles.push(that._dirEntryToTitleObject(dirEntry));
-                    return addTitles(index + 1);
+                        dirEntries.push(dirEntry);
+                    return addDirEntries(index + 1);
                 });
             };
-            return addTitles(firstIndex);
+            return addDirEntries(firstIndex);
         }).then(callback);
     };
-
-    /**
-     * 
-     * @param {rect} rectangle
-     * @param {Integer} resultSize
-     * @param {callbackTitleList} callback
-     */
-    ZIMArchive.prototype.getTitlesInCoords = function(rectangle, resultSize, callback) {
-        callback([]);
-    };
     
     /**
-     * @callback callbackTitle
-     * @param {Title} title Title found
+     * @callback callbackDirEntry
+     * @param {DirEntry} dirEntry The DirEntry found
      */
 
     /**
      * 
-     * @param {DirEntry} title
-     * @param {callbackTitle} callback
+     * @param {DirEntry} dirEntry
+     * @param {callbackDirEntry} callback
      */
-    ZIMArchive.prototype.resolveRedirect = function(title, callback) {
-        var that = this;
-        this._file.dirEntryByUrlIndex(title.redirectTarget).then(function(dirEntry) {
-            return that._dirEntryToTitleObject(dirEntry);
-        }).then(callback);
+    ZIMArchive.prototype.resolveRedirect = function(dirEntry, callback) {
+        this._file.dirEntryByUrlIndex(dirEntry.redirectTarget).then(callback);
     };
     
     /**
@@ -238,12 +222,12 @@ define(['zimfile', 'zimDirEntry', 'util', 'utf8'],
     
     /**
      * 
-     * @param {DirEntry} title
+     * @param {DirEntry} dirEntry
      * @param {callbackStringContent} callback
      */
-    ZIMArchive.prototype.readArticle = function(title, callback) {
-        return title.readData().then(function(data) {
-            callback(title.name(), utf8.parse(data));
+    ZIMArchive.prototype.readArticle = function(dirEntry, callback) {
+        dirEntry.readData().then(function(data) {
+            callback(dirEntry.title, utf8.parse(data));
         });
     };
 
@@ -254,34 +238,34 @@ define(['zimfile', 'zimDirEntry', 'util', 'utf8'],
 
     /**
      * Read a binary file.
-     * @param {DirEntry} title
+     * @param {DirEntry} dirEntry
      * @param {callbackBinaryContent} callback
      */
-    ZIMArchive.prototype.readBinaryFile = function(title, callback) {
-        return title.readData().then(function(data) {
-            callback(title.name(), data);
+    ZIMArchive.prototype.readBinaryFile = function(dirEntry, callback) {
+        return dirEntry.readData().then(function(data) {
+            callback(dirEntry.title, data);
         });
     };
     
-    var regexpTitleNameWithoutNameSpace = /^[^\/]+$/;
+    var regexpTitleWithoutNameSpace = /^[^\/]+$/;
 
     /**
-     * Searches a title (article / page) by name.
-     * @param {String} titleName
-     * @return {Promise} resolving to the title object or null if not found.
+     * Searches a DirEntry (article / page) by its title.
+     * @param {String} title
+     * @return {Promise} resolving to the DirEntry object or null if not found.
      */
-    ZIMArchive.prototype.getTitleByName = function(titleName) {
+    ZIMArchive.prototype.getDirEntryByTitle = function(title) {
         var that = this;
         // If no namespace is mentioned, it's an article, and we have to add it
-        if (regexpTitleNameWithoutNameSpace.test(titleName)) {
-            titleName= "A/" + titleName;
+        if (regexpTitleWithoutNameSpace.test(title)) {
+            title= "A/" + title;
         }
         return util.binarySearch(0, this._file.articleCount, function(i) {
             return that._file.dirEntryByUrlIndex(i).then(function(dirEntry) {
                 var url = dirEntry.namespace + "/" + dirEntry.url;
-                if (titleName < url)
+                if (title < url)
                     return -1;
-                else if (titleName > url)
+                else if (title > url)
                     return 1;
                 else
                     return 0;
@@ -290,32 +274,17 @@ define(['zimfile', 'zimDirEntry', 'util', 'utf8'],
             if (index === null) return null;
             return that._file.dirEntryByUrlIndex(index);
         }).then(function(dirEntry) {
-            if (dirEntry === null)
-                return null;
-            else
-                return that._dirEntryToTitleObject(dirEntry);
+            return dirEntry;
         });
     };
 
     /**
      * 
-     * @param {callbackTitle} callback
+     * @param {callbackDirEntry} callback
      */
-    ZIMArchive.prototype.getRandomTitle = function(callback) {
-        var that = this;
+    ZIMArchive.prototype.getRandomDirEntry = function(callback) {
         var index = Math.floor(Math.random() * this._file.articleCount);
-        this._file.dirEntryByUrlIndex(index).then(function(dirEntry) {
-            return that._dirEntryToTitleObject(dirEntry);
-        }).then(callback);
-    };
-
-    /**
-     * 
-     * @param dirEntry
-     * @returns {DirEntry}
-     */
-    ZIMArchive.prototype._dirEntryToTitleObject = function(dirEntry) {
-        return new zimDirEntry.DirEntry(this._file, dirEntry);
+        this._file.dirEntryByUrlIndex(index).then(callback);
     };
 
     /**
diff --git a/www/js/lib/zimDirEntry.js b/www/js/lib/zimDirEntry.js
index 95ad82bf2..ae1f14bcb 100644
--- a/www/js/lib/zimDirEntry.js
+++ b/www/js/lib/zimDirEntry.js
@@ -47,7 +47,7 @@ define([], function() {
      */    
     function DirEntry(zimfile, dirEntryData) {
         this._zimfile = zimfile;
-        this.redirect = dirEntryData.isRedirect;
+        this.redirect = dirEntryData.redirect;
         this.offset = dirEntryData.offset;
         this.mimetype = dirEntryData.mimetype;
         this.namespace = dirEntryData.namespace;
@@ -59,6 +59,8 @@ define([], function() {
     };
 
     /**
+     * Serialize some attributes of a DirEntry, to be able to store them in a HTML tag attribute,
+     * and retrieve them later.
      * 
      * @returns {String}
      */
@@ -68,22 +70,6 @@ define([], function() {
                 this.blob + '|' + this.url + '|' + this.title + '|' + this.redirect + '|' + this.redirectTarget;
     };
     
-    /**
-     * 
-     * @returns {String}
-     */
-    DirEntry.prototype.getReadableName = function() {
-        return this.title;
-    };
-    
-    /**
-     * 
-     * @returns {String}
-     */
-    DirEntry.prototype.name = function() {
-        return this.title;
-    };
-    
     /**
      * 
      * @returns {Boolean}
@@ -116,7 +102,7 @@ define([], function() {
         data.blob = parseInt(idParts[4], 10);
         data.url = idParts[5];
         data.title = idParts[6];
-        data.isRedirect = ( idParts[7] === "true" );
+        data.redirect = ( idParts[7] === "true" );
         data.redirectTarget = idParts[8];
         return new DirEntry(zimfile, data);
     };
diff --git a/www/js/lib/zimfile.js b/www/js/lib/zimfile.js
index e4d6e194e..5107d8f15 100644
--- a/www/js/lib/zimfile.js
+++ b/www/js/lib/zimfile.js
@@ -20,7 +20,7 @@
  * along with Kiwix (file LICENSE-GPLv3.txt).  If not, see <http://www.gnu.org/licenses/>
  */
 'use strict';
-define(['xzdec_wrapper', 'util', 'utf8', 'q'], function(xz, util, utf8, Q) {
+define(['xzdec_wrapper', 'util', 'utf8', 'q', 'zimDirEntry'], function(xz, util, utf8, Q, zimDirEntry) {
 
     var readInt = function(data, offset, size)
     {
@@ -113,7 +113,7 @@ define(['xzdec_wrapper', 'util', 'utf8', 'q'], function(xz, util, utf8, Q) {
     /**
      * 
      * @param {Integer} offset
-     * @returns {unresolved} DirEntry data (without the file)
+     * @returns {DirEntry} DirEntry
      */
     ZIMFile.prototype.dirEntry = function(offset)
     {
@@ -126,27 +126,27 @@ define(['xzdec_wrapper', 'util', 'utf8', 'q'], function(xz, util, utf8, Q) {
                 mimetype: readInt(data, 0, 2),
                 namespace: String.fromCharCode(data[3])
             };
-            dirEntry.isRedirect = (dirEntry.mimetype === 0xffff);
-            if (dirEntry.isRedirect)
+            dirEntry.redirect = (dirEntry.mimetype === 0xffff);
+            if (dirEntry.redirect)
                 dirEntry.redirectTarget = readInt(data, 8, 4);
             else
             {
                 dirEntry.cluster = readInt(data, 8, 4);
                 dirEntry.blob = readInt(data, 12, 4);
             }
-            var pos = dirEntry.isRedirect ? 12 : 16;
+            var pos = dirEntry.redirect ? 12 : 16;
             dirEntry.url = utf8.parse(data.subarray(pos), true);
             while (data[pos] !== 0)
                 pos++;
             dirEntry.title = utf8.parse(data.subarray(pos + 1), true);
-            return dirEntry;
+            return new zimDirEntry.DirEntry(that, dirEntry);
         });
     };
 
     /**
      * 
      * @param {Integer} index
-     * @returns {unresolved} DirEntry data (without the file)
+     * @returns {DirEntry} DirEntry
      */
     ZIMFile.prototype.dirEntryByUrlIndex = function(index)
     {
@@ -160,7 +160,7 @@ define(['xzdec_wrapper', 'util', 'utf8', 'q'], function(xz, util, utf8, Q) {
     /**
      * 
      * @param {Integer} index
-     * @returns {unresolved} DirEntry data (without the file)
+     * @returns {DirEntry} DirEntry
      */
     ZIMFile.prototype.dirEntryByTitleIndex = function(index)
     {