diff --git a/src/Entity/Course.php b/src/Entity/Course.php
index 7d27ccfe7a0bab560a1640831db36e67e7e03c74..88f9169cd66587e605091f356a38eab03d360542 100644
--- a/src/Entity/Course.php
+++ b/src/Entity/Course.php
@@ -15,7 +15,7 @@ use Symfony\Component\Serializer\Annotation\Groups;
  *         "get" = {
  *             "path" = "/base/courses",
  *             "openapi_context" = {
- *                 "tags" = {"Courses"},
+ *                 "tags" = {"BaseCourse"},
  *                 "parameters" = {
  *                     {"name" = "lang", "in" = "query", "description" = "Language of result", "type" = "string", "enum" = {"de", "en"}, "example" = "de"},
  *                     {"name" = "term", "in" = "query", "description" = "Teaching term", "type" = "string", "enum" = {"W", "S"}, "example" = "W"},
@@ -28,7 +28,7 @@ use Symfony\Component\Serializer\Annotation\Groups;
  *             "controller" = GetCoursesByOrganization::class,
  *             "read" = false,
  *             "openapi_context" = {
- *                 "tags" = {"Courses"},
+ *                 "tags" = {"BaseCourse"},
  *                 "summary" = "Get the Courses related to an organization.",
  *                 "parameters" = {
  *                     {"name" = "lang", "in" = "query", "description" = "Language of result", "type" = "string", "enum" = {"de", "en"}, "example" = "de"},
@@ -43,7 +43,7 @@ use Symfony\Component\Serializer\Annotation\Groups;
  *             "controller" = GetCoursesByPerson::class,
  *             "read" = false,
  *             "openapi_context" = {
- *                 "tags" = {"Courses"},
+ *                 "tags" = {"BaseCourse"},
  *                 "summary" = "Get the Courses related to a person.",
  *                 "parameters" = {
  *                     {"name" = "lang", "in" = "query", "description" = "Language of result", "type" = "string", "enum" = {"de", "en"}, "example" = "de"},
@@ -57,7 +57,7 @@ use Symfony\Component\Serializer\Annotation\Groups;
  *         "get" = {
  *             "path" = "/base/courses/{identifier}",
  *             "openapi_context" = {
- *                 "tags" = {"Courses"},
+ *                 "tags" = {"BaseCourse"},
  *                 "parameters" = {
  *                     {"name" = "identifier", "in" = "path", "description" = "Id of course", "required" = true, "type" = "string", "example" = "257571"},
  *                     {"name" = "lang", "in" = "query", "description" = "Language of result", "type" = "string", "enum" = {"de", "en"}, "example" = "de"}
@@ -66,7 +66,7 @@ use Symfony\Component\Serializer\Annotation\Groups;
  *         }
  *     },
  *     iri="https://schema.org/Course",
- *     normalizationContext={"groups" = {"Course:output"}, "jsonld_embed_context" = true},
+ *     normalizationContext={"groups" = {"BaseCourse:output"}, "jsonld_embed_context" = true},
  * )
  */
 class Course implements CourseInterface
diff --git a/src/Entity/CourseAttendee.php b/src/Entity/CourseAttendee.php
index b29e3b33c5c05b71b917db7ca028130fb16cd70f..676e60837994b22c7f674d18728f2368f26ed2e2 100644
--- a/src/Entity/CourseAttendee.php
+++ b/src/Entity/CourseAttendee.php
@@ -17,7 +17,7 @@ use Symfony\Component\Serializer\Annotation\Groups;
  *             "path" = "/course_attendees",
  *             "security" = "is_granted('IS_AUTHENTICATED_FULLY')",
  *             "openapi_context" = {
- *                 "tags" = {"Courses"}
+ *                 "tags" = {"BaseCourse"}
  *             }
  *         },
  *         "get_bycourse" = {
@@ -31,7 +31,7 @@ use Symfony\Component\Serializer\Annotation\Groups;
  *                 "groups" = {"BasePerson:output"}
  *             },
  *             "openapi_context" = {
- *                 "tags" = {"Courses"},
+ *                 "tags" = {"BaseCourse"},
  *                 "summary" = "Get the attendees of a course.",
  *                 "parameters" = {
  *                     {"name" = "identifier", "in" = "path", "description" = "Id of course", "required" = true, "type" = "string", "example" = "123456"},
@@ -45,7 +45,7 @@ use Symfony\Component\Serializer\Annotation\Groups;
  *             "path" = "/course_attendees/{identifier}",
  *             "security" = "is_granted('IS_AUTHENTICATED_FULLY')",
  *             "openapi_context" = {
- *                 "tags" = {"Courses"}
+ *                 "tags" = {"BaseCourse"}
  *             }
  *         }
  *     },