diff --git a/src/main/java/org/gitlab4j/api/ApplicationSettingsApi.java b/src/main/java/org/gitlab4j/api/ApplicationSettingsApi.java
index 1d53437b027dfcda1e1117c710aed61b42dcaf29..8ab93e16e2cbccc0f275ed6d4fa50bb42956b912 100644
--- a/src/main/java/org/gitlab4j/api/ApplicationSettingsApi.java
+++ b/src/main/java/org/gitlab4j/api/ApplicationSettingsApi.java
@@ -101,7 +101,7 @@ public class ApplicationSettingsApi extends AbstractApi {
     }
 
     /**
-     * Pareses the returned JSON and returns an ApplicationSettings instance.
+     * Parses the returned JSON and returns an ApplicationSettings instance.
      *
      * @param root the root JsonNode
      * @return the populated ApplicationSettings instance
diff --git a/src/main/java/org/gitlab4j/api/models/Setting.java b/src/main/java/org/gitlab4j/api/models/Setting.java
index 9ccdc83e104bfb3e82faa6e29c3a9aba0446e069..8c0d97253bdafce8c863adbc0fca1d83d05b4fc5 100644
--- a/src/main/java/org/gitlab4j/api/models/Setting.java
+++ b/src/main/java/org/gitlab4j/api/models/Setting.java
@@ -300,6 +300,12 @@ public enum Setting {
      */
     GITALY_TIMEOUT_MEDIUM(Integer.class),
 
+    /** Undocumented setting. */
+    GRAFANA_ENABLED(Boolean.class),
+
+    /** Undocumented setting. */
+    GRAFANA_URL(String.class),
+
     /** Enable Gravatar. */
     GRAVATAR_ENABLED(Boolean.class),
 
@@ -685,6 +691,11 @@ public enum Setting {
      */
     THROTTLE_UNAUTHENTICATED_REQUESTS_PER_PERIOD(Integer.class),
 
+    /**
+     * Limit display of time tracking units to hours. Default is false.
+     */
+    TIME_TRACKING_LIMIT_TO_HOURS(Boolean.class),
+
     /**
      * required by: require_two_factor_authentication Amount of time (in hours) that
      * users are allowed to skip forced configuration of two-factor authentication.
diff --git a/src/test/java/org/gitlab4j/api/TestNamespaceApi.java b/src/test/java/org/gitlab4j/api/TestNamespaceApi.java
index f7e42f91b7d62e990c257c7d70251ec141c9dde7..dd2bfb33aa39542d64453c9026594948236d1ff5 100644
--- a/src/test/java/org/gitlab4j/api/TestNamespaceApi.java
+++ b/src/test/java/org/gitlab4j/api/TestNamespaceApi.java
@@ -2,10 +2,12 @@ package org.gitlab4j.api;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeNotNull;
 
 import java.util.List;
+import java.util.Optional;
 
 import org.gitlab4j.api.models.Namespace;
 import org.junit.Before;
@@ -47,12 +49,9 @@ public class TestNamespaceApi extends AbstractIntegrationTest {
     public void testGetNamespaces() throws GitLabApiException {
         List<Namespace> namespaces = gitLabApi.getNamespaceApi().getNamespaces();
         assertNotNull(namespaces);
-        for (Namespace namespace : namespaces) {
-            if (TEST_NAMESPACE.equals(namespace.getName()))
-                 return;
-        }
-
-        fail(TEST_NAMESPACE + " not found!");
+        Optional<Namespace> matchingNamespace = namespaces.stream().
+                filter(n -> n.getPath().equals(TEST_NAMESPACE)).findFirst();
+        assertTrue(TEST_NAMESPACE + " not found!", matchingNamespace.isPresent());
     }
 
     @Test
@@ -63,7 +62,7 @@ public class TestNamespaceApi extends AbstractIntegrationTest {
         while (pager.hasNext()) {
             List<Namespace> namespaces = pager.next();
             for (Namespace namespace : namespaces) {
-                if (TEST_NAMESPACE.equals(namespace.getName()))
+                if (TEST_NAMESPACE.equals(namespace.getPath()))
                     return;
             }
         }
@@ -75,39 +74,36 @@ public class TestNamespaceApi extends AbstractIntegrationTest {
     public void testGetNamespacesByPage() throws GitLabApiException {
         List<Namespace> namespaces = gitLabApi.getNamespaceApi().getNamespaces(1, 10);
         assertNotNull(namespaces);
-        for (Namespace namespace : namespaces) {
-            if (TEST_NAMESPACE.equals(namespace.getName()))
-                 return;
-        }
-
-        fail(TEST_NAMESPACE + " not found!");
+        Optional<Namespace> matchingNamespace = namespaces.stream().
+                filter(n -> n.getPath().equals(TEST_NAMESPACE)).findFirst();
+        assertTrue(TEST_NAMESPACE + " not found!", matchingNamespace.isPresent());
     }
 
     @Test
     public void testFindNamespaces() throws GitLabApiException {
         List<Namespace> namespaces = gitLabApi.getNamespaceApi().findNamespaces(TEST_NAMESPACE);
         assertNotNull(namespaces);
-        assertEquals(TEST_NAMESPACE, namespaces.get(0).getName());
+        assertEquals(TEST_NAMESPACE, namespaces.get(0).getPath());
     }
 
     @Test
     public void testFindSubgroupNamespaces() throws GitLabApiException {
         List<Namespace> namespaces = gitLabApi.getNamespaceApi().findNamespaces(TEST_SUB_GROUP);
         assertNotNull(namespaces);
-        assertEquals(TEST_SUB_GROUP, namespaces.get(0).getName());
+        assertEquals(TEST_SUB_GROUP, namespaces.get(0).getPath());
     }
 
     @Test
     public void testFindNamespacesByPage() throws GitLabApiException {
         List<Namespace> namespaces = gitLabApi.getNamespaceApi().findNamespaces(TEST_NAMESPACE, 1, 10);
         assertNotNull(namespaces);
-        assertEquals(TEST_NAMESPACE, namespaces.get(0).getName());
+        assertEquals(TEST_NAMESPACE, namespaces.get(0).getPath());
     }
 
     @Test
     public void testFindNamespacesViaPager() throws GitLabApiException {
         Pager<Namespace> pager = gitLabApi.getNamespaceApi().findNamespaces(TEST_NAMESPACE, 10);
         assertNotNull(pager);
-        assertEquals(TEST_NAMESPACE, pager.next().get(0).getName());
+        assertEquals(TEST_NAMESPACE, pager.next().get(0).getPath());
     }
 }
diff --git a/src/test/java/org/gitlab4j/api/TestProjectApi.java b/src/test/java/org/gitlab4j/api/TestProjectApi.java
index 391afd038d7e61f96dc28bb350c0fadab6af183a..3dd3ea83c665f7a28198a192b3c18a79c683acab 100644
--- a/src/test/java/org/gitlab4j/api/TestProjectApi.java
+++ b/src/test/java/org/gitlab4j/api/TestProjectApi.java
@@ -691,12 +691,12 @@ public class TestProjectApi extends AbstractIntegrationTest {
         assertFalse(matchingVariable.getProtected());
         assertNull(matchingVariable.getEnvironmentScope());
 
-        gitLabApi.getProjectApi().updateVariable(testProject, key, "NONE", true, "DEV");
+        gitLabApi.getProjectApi().updateVariable(testProject, key, "NO_VALUE", true, "DEV");
         variable = gitLabApi.getProjectApi().getVariable(testProject, key);
 
         assertNotNull(variable);
         assertEquals(key, variable.getKey());
-        assertEquals("NONE", variable.getValue());
+        assertEquals("NO_VALUE", variable.getValue());
         assertTrue(variable.getProtected());
 
         gitLabApi.getProjectApi().updateVariable(testProject, key, value, Variable.Type.ENV_VAR, false, true, "DEV");