diff --git a/api-data-store-server-javascript/src/js/server-data-store-client.html b/api-data-store-server-javascript/src/js/server-data-store-client.html
index d6e3b4ef947fdae51c3c79ec9e52bcd60929462b..cb8145ffd3b70ce2912deadcdc0eed3e578f9f42 100644
--- a/api-data-store-server-javascript/src/js/server-data-store-client.html
+++ b/api-data-store-server-javascript/src/js/server-data-store-client.html
@@ -16,12 +16,13 @@
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
+<html lang="en">
<head>
<!--
This is a simple Test app for new DSS. It strives to be the simplest non-trivial app.
It logs into the server and allows users to perform the simplest operations.
-->
+ <meta charset="utf-8" content=""/>
<title>OpenBIS Simple Test</title>
<link type="text/css" rel="stylesheet" href="body-style.css"/>
<link type="text/css" rel="stylesheet" href="button.css"/>
@@ -29,7 +30,6 @@
<script type="text/javascript" src="server-data-store-facade.js"></script>
<script type="text/javascript" src="server-data-store-login.js"></script>
<script type="text/javascript" src="server-data-store-client.js"></script>
-
</head>
<body>
<img id="openbis-logo" src="images/openBIS_Logo.png" alt="openBIS"
diff --git a/api-data-store-server-javascript/src/js/server-data-store-client.js b/api-data-store-server-javascript/src/js/server-data-store-client.js
index a4b0c5c4ff6ed21ca6473c9a739a2cf16f88ea96..044fddbf5e4153bcb302de20d3dadf456a4516af 100644
--- a/api-data-store-server-javascript/src/js/server-data-store-client.js
+++ b/api-data-store-server-javascript/src/js/server-data-store-client.js
@@ -1,11 +1,11 @@
/** Default owner/source */
const owner = "demo-sample";
const source = "";
-const HTTP_SERVER_URI = "/fileserver";
+const HTTP_SERVER_URI = "/data-store-server";
/// The datastoreServer we use for our data
// datastoreServer = new datastore('https://localhost:8443/openbis', 'https://localhost:8444/datastore_server');
-datastoreServer = new datastore('http://localhost:8085', HTTP_SERVER_URI);
+datastoreServer = new dataStoreServer('http://localhost:8085', HTTP_SERVER_URI);