diff --git a/src/Entity/Organization.php b/src/Entity/Organization.php
index 063ab074aca0a21e748c975f87f06c0107b82099..a68b97860466185f8ce07f3ce2968911fa9cc28a 100644
--- a/src/Entity/Organization.php
+++ b/src/Entity/Organization.php
@@ -12,7 +12,7 @@ use Symfony\Component\Serializer\Annotation\Groups;
  * @ApiResource(
  *     collectionOperations={
  *         "get" = {
- *             "path" = "/organizations",
+ *             "path" = "/base/organizations",
  *             "openapi_context" = {
  *                 "tags" = {"BaseOrganization"},
  *                 "parameters" = {
@@ -22,7 +22,7 @@ use Symfony\Component\Serializer\Annotation\Groups;
  *         },
  *         "get_orgs" = {
  *             "method" = "GET",
- *             "path" = "/people/{identifier}/organizations",
+ *             "path" = "/base/people/{identifier}/organizations",
  *             "controller" = GetOrganizationsByPerson::class,
  *             "read" = false,
  *             "openapi_context" = {
@@ -38,7 +38,7 @@ use Symfony\Component\Serializer\Annotation\Groups;
  *     },
  *     itemOperations={
  *         "get" = {
- *             "path" = "/organizations/{identifier}",
+ *             "path" = "/base/organizations/{identifier}",
  *             "openapi_context" = {
  *                 "tags" = {"BaseOrganization"},
  *                 "parameters" = {
@@ -49,6 +49,7 @@ use Symfony\Component\Serializer\Annotation\Groups;
  *         },
  *     },
  *     iri="http://schema.org/Organization",
+ *     shortName="BaseOrganization",
  *     description="An organization",
  *     normalizationContext={
  *         "jsonld_embed_context" = true,
diff --git a/tests/ExtTest.php b/tests/ExtTest.php
index e11f5d69296c267baa5b9eeae7fec076535f83a3..6e4e2aaa62d9bf0fc163a4b4e8850277e2af69cc 100644
--- a/tests/ExtTest.php
+++ b/tests/ExtTest.php
@@ -14,9 +14,9 @@ class ExtTest extends ApiTestCase
         $client = self::createClient();
 
         $endpoints = [
-            // FIXME: '/people/foo/organizations',
-            '/organizations',
-            '/organizations/foo',
+            '/base/people/foo/organizations',
+            '/base/organizations',
+            '/base/organizations/foo',
         ];
         foreach ($endpoints as $path) {
             $response = $client->request('GET', $path);