diff --git a/Sources/AmiiboService/Public/Clients/AmiiboLiveClient.swift b/Sources/AmiiboService/Public/Clients/AmiiboLiveClient.swift
index 1b96582..bf9a374 100644
--- a/Sources/AmiiboService/Public/Clients/AmiiboLiveClient.swift
+++ b/Sources/AmiiboService/Public/Clients/AmiiboLiveClient.swift
@@ -203,7 +203,7 @@ private extension AmiiboLiveClient {
                 switch output.amiibo {
                 case let .Amiibo(object):
                     return [Amiibo(object)]
-                case let .AmiiboList(list):
+                case let .case2(list):
                     return list
                         .map { Amiibo($0) }
                         .sorted { $0.identifier < $1.identifier }
@@ -247,7 +247,7 @@ private extension AmiiboLiveClient {
                 switch output.amiibo {
                 case let .AmiiboSeries(payload):
                     return [AmiiboSeries(payload.value1)]
-                case let .AmiiboSeriesList(list):
+                case let .case2(list):
                     return list
                         .map { AmiiboSeries($0.value1) }
                         .sorted { $0.key < $1.key }
@@ -289,7 +289,7 @@ private extension AmiiboLiveClient {
                 switch output.amiibo {
                 case let .AmiiboType(payload):
                     return [AmiiboType(payload.value1)]
-                case let .AmiiboTypeList(list):
+                case let .case2(list):
                     return list
                         .map { AmiiboType($0.value1) }
                         .sorted { $0.key < $1.key }
@@ -331,7 +331,7 @@ private extension AmiiboLiveClient {
                 switch output.amiibo {
                 case let .GameCharacter(payload):
                     return [GameCharacter(payload.value1)]
-                case let .GameCharacterList(list):
+                case let .case2(list):
                     return list
                         .map { GameCharacter($0.value1) }
                         .sorted { $0.key < $1.key }
@@ -373,7 +373,7 @@ private extension AmiiboLiveClient {
                 switch output.amiibo {
                 case let .GameSeries(payload):
                     return [GameSeries(payload.value1)]
-                case let .GameSeriesList(list):
+                case let .case2(list):
                     return list
                         .map { GameSeries($0.value1) }
                         .sorted { $0.key < $1.key }
diff --git a/Sources/AmiiboService/openapi.yaml b/Sources/AmiiboService/openapi.yaml
index cab0865..45986d3 100644
--- a/Sources/AmiiboService/openapi.yaml
+++ b/Sources/AmiiboService/openapi.yaml
@@ -507,32 +507,6 @@ components:
       required:
         - key
         - name
-# List Entities
-    AmiiboList:
-      description: A type that contains a list of amiibos.
-      type: array
-      items:
-        $ref: '#/components/schemas/Amiibo'
-    AmiiboSeriesList:
-      description: A type that represents a list of amiibo series.
-      type: array
-      items:
-        $ref: '#/components/schemas/AmiiboSeries'
-    AmiiboTypeList:
-      description: A type that represents a list of amiibo types.
-      type: array
-      items:
-        $ref: '#/components/schemas/AmiiboType'
-    GameCharacterList:
-      description: A type that represents a list of game characters.
-      type: array
-      items:
-        $ref: '#/components/schemas/GameCharacter'
-    GameSeriesList:
-      description: A type that represents a list of game series.
-      type: array
-      items:
-        $ref: '#/components/schemas/GameSeries'
 # Wrapper Entities
     AmiiboWrapper:
       description: A type that wraps either none, one or a list of amiibos.
@@ -542,7 +516,11 @@ components:
           description: A container that have zero, one or more amiibos.
           oneOf:
             - $ref: '#/components/schemas/Amiibo'
-            - $ref: '#/components/schemas/AmiiboList'
+              description: A certain amiibo.
+            - type: array
+              description: A list that contains amiibos.
+              items:
+                $ref: '#/components/schemas/Amiibo'
     AmiiboSeriesWrapper:
       description: A type that wraps either one or a list of amiibo series.
       type: object
@@ -551,7 +529,11 @@ components:
           description: A container that have one or more amiibo series.
           oneOf:
             - $ref: '#/components/schemas/AmiiboSeries'
-            - $ref: '#/components/schemas/AmiiboSeriesList'
+              description: A certain amiibo series.
+            - type: array
+              description: A list that contains amiibo series.
+              items:
+                $ref: '#/components/schemas/AmiiboSeries'
       required: 
         - amiibo    
     AmiiboTypeWrapper:
@@ -562,7 +544,11 @@ components:
           description: A container that have one or more amiibo types.
           oneOf:
             - $ref: '#/components/schemas/AmiiboType'
-            - $ref: '#/components/schemas/AmiiboTypeList'
+              description: A certain amiibo type.
+            - type: array
+              description: A list that contains amiibo types.
+              items:
+                $ref: '#/components/schemas/AmiiboType'
       required: 
         - amiibo
     GameCharacterWrapper:
@@ -573,7 +559,11 @@ components:
           description: A container that have one or more game characters.
           oneOf:
             - $ref: '#/components/schemas/GameCharacter'
-            - $ref: '#/components/schemas/GameCharacterList'
+              description: A certain game character.
+            - type: array
+              description: A list that contains game characters.
+              items:
+                $ref: '#/components/schemas/GameCharacter'
       required: 
         - amiibo
     GameSeriesWrapper:
@@ -584,7 +574,11 @@ components:
           description: A container that have one or more game series.
           oneOf:
             - $ref: '#/components/schemas/GameSeries'
-            - $ref: '#/components/schemas/GameSeriesList'
+              description: A certain game series.
+            - type: array
+              description: A list that contains game series.
+              items:
+                $ref: '#/components/schemas/GameSeries'
       required: 
         - amiibo
 # Error Entities