diff --git a/data_models/__init__.py b/data_models/__init__.py
index 5c6cb64..f07652e 100644
--- a/data_models/__init__.py
+++ b/data_models/__init__.py
@@ -1,12 +1,4 @@
-"""
-Copyright 2020 The Magma Authors.
-
-This source code is licensed under the BSD-style license found in the
-LICENSE file in the root directory of this source tree.
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-"""
+# SPDX-FileCopyrightText: 2020 The Magma Authors.
+# SPDX-FileCopyrightText: 2022 Open Networking Foundation <support@opennetworking.org>
+#
+# SPDX-License-Identifier: BSD-3-Clause
\ No newline at end of file
diff --git a/data_models/data_model.py b/data_models/data_model.py
index 0c8ba27..997748f 100644
--- a/data_models/data_model.py
+++ b/data_models/data_model.py
@@ -1,15 +1,7 @@
-"""
-Copyright 2020 The Magma Authors.
-
-This source code is licensed under the BSD-style license found in the
-LICENSE file in the root directory of this source tree.
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-"""
+# SPDX-FileCopyrightText: 2020 The Magma Authors.
+# SPDX-FileCopyrightText: 2022 Open Networking Foundation <support@opennetworking.org>
+#
+# SPDX-License-Identifier: BSD-3-Clause
 
 from abc import ABC, abstractmethod
 from collections import namedtuple
diff --git a/data_models/data_model_parameters.py b/data_models/data_model_parameters.py
index 751b351..3b83067 100644
--- a/data_models/data_model_parameters.py
+++ b/data_models/data_model_parameters.py
@@ -1,16 +1,7 @@
-"""
-Copyright 2020 The Magma Authors.
-
-This source code is licensed under the BSD-style license found in the
-LICENSE file in the root directory of this source tree.
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-"""
-
+# SPDX-FileCopyrightText: 2020 The Magma Authors.
+# SPDX-FileCopyrightText: 2022 Open Networking Foundation <support@opennetworking.org>
+#
+# SPDX-License-Identifier: BSD-3-Clause
 
 class ParameterName():
     # Top-level objects
@@ -53,8 +44,6 @@
     PCI = 'PCI'
     DL_BANDWIDTH = 'DL bandwidth'
     UL_BANDWIDTH = 'UL bandwidth'
-    SUBFRAME_ASSIGNMENT = 'Subframe assignment'
-    SPECIAL_SUBFRAME_PATTERN = 'Special subframe pattern'
     TX_POWER = "tx_power"
     TUNNEL_TYPE = "tunnel_type"
 
@@ -73,6 +62,11 @@
     CELL_BARRED = 'Cell barred'
     PRIM_SOURCE = "prim_source"
 
+    # Cell parameters
+    CELL_ENABLE64QAM = "cell_enable64qam"
+    SPECIAL_SUBFRAME_PATTERN = 'special_subframe_pattern'
+    SUBFRAME_ASSIGNMENT = 'subframe_assignment'
+
     # Core network parameters
     MME_IP = 'MME IP'
     MME_PORT = 'MME port'
diff --git a/data_models/transform_for_enb.py b/data_models/transform_for_enb.py
index 7f3aaf8..6075f40 100644
--- a/data_models/transform_for_enb.py
+++ b/data_models/transform_for_enb.py
@@ -1,15 +1,7 @@
-"""
-Copyright 2020 The Magma Authors.
-
-This source code is licensed under the BSD-style license found in the
-LICENSE file in the root directory of this source tree.
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-"""
+# SPDX-FileCopyrightText: 2020 The Magma Authors.
+# SPDX-FileCopyrightText: 2022 Open Networking Foundation <support@opennetworking.org>
+#
+# SPDX-License-Identifier: BSD-3-Clause
 
 from exceptions import ConfigurationError
 
diff --git a/data_models/transform_for_magma.py b/data_models/transform_for_magma.py
index 715cfba..e7c2b81 100644
--- a/data_models/transform_for_magma.py
+++ b/data_models/transform_for_magma.py
@@ -1,15 +1,8 @@
-"""
-Copyright 2020 The Magma Authors.
+# SPDX-FileCopyrightText: 2020 The Magma Authors.
+# SPDX-FileCopyrightText: 2022 Open Networking Foundation <support@opennetworking.org>
+#
+# SPDX-License-Identifier: BSD-3-Clause
 
-This source code is licensed under the BSD-style license found in the
-LICENSE file in the root directory of this source tree.
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-"""
 import textwrap
 from typing import Optional, Union