diff --git a/schema/switch.yml b/schema/switch.yml
index 73e9379..c5650ae 100644
--- a/schema/switch.yml
+++ b/schema/switch.yml
@@ -439,58 +439,66 @@ properties:
               description: Configures the peer-link, which could be a physical port or a trunk group that connects the two MC-LAG peer switches.
               type: object
               properties:
-                type:
+                link-type:
                   description: Defines the type of peer-link, either 'port' or 'trunk-group'
                   type: string
                   enum:
                     - port
                     - trunk-group
                   default: trunk-group
-                value:
-                  description: Specifies the port or trunk-group ID for the peer-link.
+                port-id:
+                  description: Specifies the physical port name used as peer-link (only valid if type = port).
+                  type: string
+                  examples:
+                    - "Ethernet1"
+                    - "Ethernet2"
+                trunk-id:
+                  description: Specifies the trunk group ID used as peer-link (only valid if type = trunk-group).
                   type: integer
                   minimum: 1
                   maximum: 64
             mclag-group:
-              description: Configures the MC-LAG group, which binds the interfaces into a multi-chassis LAG.
-              type: object
-              properties:
-                group-id:
-                  description: Defines the unique MC-LAG group identifier.
-                  type: integer
-                  minimum: 1
-                  maximum: 128
-                members:
-                  description: List of interfaces that participate in the MC-LAG group.
-                  type: array
-                  items:
-                    type: string
-                    description: Interface names that are part of the MC-LAG group.
-                    examples:
-                      - eth0
-                      - eth1
-                lacp-config:
-                  description: LACP configuration settings for the MC-LAG group.
-                  type: object
-                  properties:
-                    lacp-enable:
-                      description: Enables or disables LACP for the MC-LAG group.
-                      type: boolean
-                      default: true
-                    lacp-role:
-                      description: Configures the LACP role as 'actor' or 'partner'
+              description: Configures the MC-LAG group(s), which binds the interfaces into a multi-chassis LAG.
+              type: array
+              items:
+                type: object
+                properties:
+                  group-id:
+                    description: Defines the unique MC-LAG group identifier.
+                    type: integer
+                    minimum: 1
+                    maximum: 128
+                  members:
+                    description: List of interfaces that participate in the MC-LAG group.
+                    type: array
+                    items:
                       type: string
-                      enum:
-                        - actor
-                        - partner
-                      default: actor
-                    lacp-timeout:
-                      description: Sets the LACP timeout as either 'short' or 'long'.
-                      type: string
-                      enum:
-                        - short
-                        - long
-                      default: long
+                      description: Interface names that are part of the MC-LAG group.
+                      examples:
+                        - Ethernet0
+                        - Ethernet1
+                  lacp-config:
+                    description: LACP configuration settings for the MC-LAG group.
+                    type: object
+                    properties:
+                      lacp-enable:
+                        description: Enables or disables LACP for the MC-LAG group.
+                        type: boolean
+                        default: true
+                      lacp-role:
+                        description: Configures the LACP role as 'actor' or 'partner'
+                        type: string
+                        enum:
+                          - actor
+                          - partner
+                        default: actor
+                      lacp-timeout:
+                        description: Sets the LACP timeout as either 'short' or 'long'.
+                        type: string
+                        enum:
+                          - short
+                          - long
+                        default: long
             system-priority:
               description: Specifies the system priority used by the switch for LACP negotiations.
               type: integer
diff --git a/ucentral.schema.full.json b/ucentral.schema.full.json
index 379e4f3..a01038f 100644
--- a/ucentral.schema.full.json
+++ b/ucentral.schema.full.json
@@ -1289,7 +1289,7 @@
                                         "description": "Configures the peer-link, which could be a physical port or a trunk group that connects the two MC-LAG peer switches.",
                                         "type": "object",
                                         "properties": {
-                                            "type": {
+                                            "link-type": {
                                                 "description": "Defines the type of peer-link, either 'port' or 'trunk-group'",
                                                 "type": "string",
                                                 "enum": [
@@ -1298,8 +1298,16 @@
                                                 ],
                                                 "default": "trunk-group"
                                             },
-                                            "value": {
-                                                "description": "Specifies the port or trunk-group ID for the peer-link.",
+                                            "port-id": {
+                                                "description": "Specifies the physical port name used as peer-link (only valid if type = port).",
+                                                "type": "string",
+                                                "examples": [
+                                                    "Ethernet1",
+                                                    "Ethernet2"
+                                                ]
+                                            },
+                                            "trunk-id": {
+                                                "description": "Specifies the trunk group ID used as peer-link (only valid if type = trunk-group).",
                                                 "type": "integer",
                                                 "minimum": 1,
                                                 "maximum": 64
@@ -1307,53 +1315,56 @@
                                         }
                                     },
                                     "mclag-group": {
-                                        "description": "Configures the MC-LAG group, which binds the interfaces into a multi-chassis LAG.",
-                                        "type": "object",
-                                        "properties": {
-                                            "group-id": {
-                                                "description": "Defines the unique MC-LAG group identifier.",
-                                                "type": "integer",
-                                                "minimum": 1,
-                                                "maximum": 128
-                                            },
-                                            "members": {
-                                                "description": "List of interfaces that participate in the MC-LAG group.",
-                                                "type": "array",
-                                                "items": {
-                                                    "type": "string",
-                                                    "description": "Interface names that are part of the MC-LAG group.",
-                                                    "examples": [
-                                                        "eth0",
-                                                        "eth1"
-                                                    ]
-                                                }
-                                            },
-                                            "lacp-config": {
-                                                "description": "LACP configuration settings for the MC-LAG group.",
-                                                "type": "object",
-                                                "properties": {
-                                                    "lacp-enable": {
-                                                        "description": "Enables or disables LACP for the MC-LAG group.",
-                                                        "type": "boolean",
-                                                        "default": true
-                                                    },
-                                                    "lacp-role": {
-                                                        "description": "Configures the LACP role as 'actor' or 'partner'",
+                                        "description": "Configures the MC-LAG group(s), which binds the interfaces into a multi-chassis LAG.",
+                                        "type": "array",
+                                        "items": {
+                                            "type": "object",
+                                            "properties": {
+                                                "group-id": {
+                                                    "description": "Defines the unique MC-LAG group identifier.",
+                                                    "type": "integer",
+                                                    "minimum": 1,
+                                                    "maximum": 128
+                                                },
+                                                "members": {
+                                                    "description": "List of interfaces that participate in the MC-LAG group.",
+                                                    "type": "array",
+                                                    "items": {
                                                         "type": "string",
-                                                        "enum": [
-                                                            "actor",
-                                                            "partner"
-                                                        ],
-                                                        "default": "actor"
-                                                    },
-                                                    "lacp-timeout": {
-                                                        "description": "Sets the LACP timeout as either 'short' or 'long'.",
-                                                        "type": "string",
-                                                        "enum": [
-                                                            "short",
-                                                            "long"
-                                                        ],
-                                                        "default": "long"
+                                                        "description": "Interface names that are part of the MC-LAG group.",
+                                                        "examples": [
+                                                            "Ethernet0",
+                                                            "Ethernet1"
+                                                        ]
+                                                    }
+                                                },
+                                                "lacp-config": {
+                                                    "description": "LACP configuration settings for the MC-LAG group.",
+                                                    "type": "object",
+                                                    "properties": {
+                                                        "lacp-enable": {
+                                                            "description": "Enables or disables LACP for the MC-LAG group.",
+                                                            "type": "boolean",
+                                                            "default": true
+                                                        },
+                                                        "lacp-role": {
+                                                            "description": "Configures the LACP role as 'actor' or 'partner'",
+                                                            "type": "string",
+                                                            "enum": [
+                                                                "actor",
+                                                                "partner"
+                                                            ],
+                                                            "default": "actor"
+                                                        },
+                                                        "lacp-timeout": {
+                                                            "description": "Sets the LACP timeout as either 'short' or 'long'.",
+                                                            "type": "string",
+                                                            "enum": [
+                                                                "short",
+                                                                "long"
+                                                            ],
+                                                            "default": "long"
+                                                        }
                                                     }
                                                 }
                                             }
diff --git a/ucentral.schema.json b/ucentral.schema.json
index 001e57e..a250705 100644
--- a/ucentral.schema.json
+++ b/ucentral.schema.json
@@ -1474,7 +1474,7 @@
                                     "peer-link": {
                                         "type": "object",
                                         "properties": {
-                                            "type": {
+                                            "link-type": {
                                                 "type": "string",
                                                 "enum": [
                                                     "port",
@@ -1482,7 +1482,14 @@
                                                 ],
                                                 "default": "trunk-group"
                                             },
-                                            "value": {
+                                            "port-id": {
+                                                "type": "string",
+                                                "examples": [
+                                                    "Ethernet1",
+                                                    "Ethernet2"
+                                                ]
+                                            },
+                                            "trunk-id": {
                                                 "type": "integer",
                                                 "minimum": 1,
                                                 "maximum": 64
@@ -1490,45 +1497,48 @@
                                         }
                                     },
                                     "mclag-group": {
-                                        "type": "object",
-                                        "properties": {
-                                            "group-id": {
-                                                "type": "integer",
-                                                "minimum": 1,
-                                                "maximum": 128
-                                            },
-                                            "members": {
-                                                "type": "array",
-                                                "items": {
-                                                    "type": "string",
-                                                    "examples": [
-                                                        "eth0",
-                                                        "eth1"
-                                                    ]
-                                                }
-                                            },
-                                            "lacp-config": {
-                                                "type": "object",
-                                                "properties": {
-                                                    "lacp-enable": {
-                                                        "type": "boolean",
-                                                        "default": true
-                                                    },
-                                                    "lacp-role": {
+                                        "type": "array",
+                                        "items": {
+                                            "type": "object",
+                                            "properties": {
+                                                "group-id": {
+                                                    "type": "integer",
+                                                    "minimum": 1,
+                                                    "maximum": 128
+                                                },
+                                                "members": {
+                                                    "type": "array",
+                                                    "items": {
                                                         "type": "string",
-                                                        "enum": [
-                                                            "actor",
-                                                            "partner"
-                                                        ],
-                                                        "default": "actor"
-                                                    },
-                                                    "lacp-timeout": {
-                                                        "type": "string",
-                                                        "enum": [
-                                                            "short",
-                                                            "long"
-                                                        ],
-                                                        "default": "long"
+                                                        "examples": [
+                                                            "Ethernet0",
+                                                            "Ethernet1"
+                                                        ]
+                                                    }
+                                                },
+                                                "lacp-config": {
+                                                    "type": "object",
+                                                    "properties": {
+                                                        "lacp-enable": {
+                                                            "type": "boolean",
+                                                            "default": true
+                                                        },
+                                                        "lacp-role": {
+                                                            "type": "string",
+                                                            "enum": [
+                                                                "actor",
+                                                                "partner"
+                                                            ],
+                                                            "default": "actor"
+                                                        },
+                                                        "lacp-timeout": {
+                                                            "type": "string",
+                                                            "enum": [
+                                                                "short",
+                                                                "long"
+                                                            ],
+                                                            "default": "long"
+                                                        }
                                                     }
                                                 }
                                             }
diff --git a/ucentral.schema.pretty.json b/ucentral.schema.pretty.json
index fe0c64c..de89933 100644
--- a/ucentral.schema.pretty.json
+++ b/ucentral.schema.pretty.json
@@ -1747,7 +1747,7 @@
                                         "description": "Configures the peer-link, which could be a physical port or a trunk group that connects the two MC-LAG peer switches.",
                                         "type": "object",
                                         "properties": {
-                                            "type": {
+                                            "link-type": {
                                                 "description": "Defines the type of peer-link, either 'port' or 'trunk-group'",
                                                 "type": "string",
                                                 "enum": [
@@ -1756,8 +1756,16 @@
                                                 ],
                                                 "default": "trunk-group"
                                             },
-                                            "value": {
-                                                "description": "Specifies the port or trunk-group ID for the peer-link.",
+                                            "port-id": {
+                                                "description": "Specifies the physical port name used as peer-link (only valid if type = port).",
+                                                "type": "string",
+                                                "examples": [
+                                                    "Ethernet1",
+                                                    "Ethernet2"
+                                                ]
+                                            },
+                                            "trunk-id": {
+                                                "description": "Specifies the trunk group ID used as peer-link (only valid if type = trunk-group).",
                                                 "type": "integer",
                                                 "minimum": 1,
                                                 "maximum": 64
@@ -1765,53 +1773,56 @@
                                         }
                                     },
                                     "mclag-group": {
-                                        "description": "Configures the MC-LAG group, which binds the interfaces into a multi-chassis LAG.",
-                                        "type": "object",
-                                        "properties": {
-                                            "group-id": {
-                                                "description": "Defines the unique MC-LAG group identifier.",
-                                                "type": "integer",
-                                                "minimum": 1,
-                                                "maximum": 128
-                                            },
-                                            "members": {
-                                                "description": "List of interfaces that participate in the MC-LAG group.",
-                                                "type": "array",
-                                                "items": {
-                                                    "type": "string",
-                                                    "description": "Interface names that are part of the MC-LAG group.",
-                                                    "examples": [
-                                                        "eth0",
-                                                        "eth1"
-                                                    ]
-                                                }
-                                            },
-                                            "lacp-config": {
-                                                "description": "LACP configuration settings for the MC-LAG group.",
-                                                "type": "object",
-                                                "properties": {
-                                                    "lacp-enable": {
-                                                        "description": "Enables or disables LACP for the MC-LAG group.",
-                                                        "type": "boolean",
-                                                        "default": true
-                                                    },
-                                                    "lacp-role": {
-                                                        "description": "Configures the LACP role as 'actor' or 'partner'",
+                                        "description": "Configures the MC-LAG group(s), which binds the interfaces into a multi-chassis LAG.",
+                                        "type": "array",
+                                        "items": {
+                                            "type": "object",
+                                            "properties": {
+                                                "group-id": {
+                                                    "description": "Defines the unique MC-LAG group identifier.",
+                                                    "type": "integer",
+                                                    "minimum": 1,
+                                                    "maximum": 128
+                                                },
+                                                "members": {
+                                                    "description": "List of interfaces that participate in the MC-LAG group.",
+                                                    "type": "array",
+                                                    "items": {
                                                         "type": "string",
-                                                        "enum": [
-                                                            "actor",
-                                                            "partner"
-                                                        ],
-                                                        "default": "actor"
-                                                    },
-                                                    "lacp-timeout": {
-                                                        "description": "Sets the LACP timeout as either 'short' or 'long'.",
-                                                        "type": "string",
-                                                        "enum": [
-                                                            "short",
-                                                            "long"
-                                                        ],
-                                                        "default": "long"
+                                                        "description": "Interface names that are part of the MC-LAG group.",
+                                                        "examples": [
+                                                            "Ethernet0",
+                                                            "Ethernet1"
+                                                        ]
+                                                    }
+                                                },
+                                                "lacp-config": {
+                                                    "description": "LACP configuration settings for the MC-LAG group.",
+                                                    "type": "object",
+                                                    "properties": {
+                                                        "lacp-enable": {
+                                                            "description": "Enables or disables LACP for the MC-LAG group.",
+                                                            "type": "boolean",
+                                                            "default": true
+                                                        },
+                                                        "lacp-role": {
+                                                            "description": "Configures the LACP role as 'actor' or 'partner'",
+                                                            "type": "string",
+                                                            "enum": [
+                                                                "actor",
+                                                                "partner"
+                                                            ],
+                                                            "default": "actor"
+                                                        },
+                                                        "lacp-timeout": {
+                                                            "description": "Sets the LACP timeout as either 'short' or 'long'.",
+                                                            "type": "string",
+                                                            "enum": [
+                                                                "short",
+                                                                "long"
+                                                            ],
+                                                            "default": "long"
+                                                        }
                                                     }
                                                 }
                                             }