+--------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| CPE | Customer Premise Equipment |
+--------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| CSAR | `Cloud Service ARchive (link) <http://openbaton.github.io/documentation/tosca-CSAR-onboarding/>`__ |
+| CSAR | `Cloud Service ARchive (link) <https://openbaton.github.io/documentation/tosca-CSAR-onboarding/>`__ |
+--------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| DAO | `Data Access Object <https://en.wikipedia.org/wiki/Data_access_object>`__ |
+--------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+--------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| ESR | `External System Register <https://wiki.onap.org/pages/viewpage.action?pageId=5734948>`__ |
+--------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| ETSI | `European Telecommunications Standards Institute <http://www.etsi.org/technologies-clusters/technologies/689-network-functions-virtualisation>`__ |
+| ETSI | `European Telecommunications Standards Institute <https://www.etsi.org/technologies/689-network-functions-virtualisation>`__ |
+--------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| EUAG | `ONAP End User Advisory Group <https://wiki.lfnetworking.org/pages/viewpage.action?pageId=2916362>`__ |
+--------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+--------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| IDS | `Intrusion Detection System <https://en.wikipedia.org/wiki/Intrusion_detection_system>`__ |
+--------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| IETF | `Internet Engineering Task Force <http://www.ietf.org>`__ |
+| IETF | `Internet Engineering Task Force <https://www.ietf.org>`__ |
+--------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| IKE | `Internet Key Exchange <https://en.wikipedia.org/wiki/Internet_Key_Exchange>`__ |
+--------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+--------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| VM | Virtual Machine |
+--------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| VNF | `Virtual Network Function <http://searchsdn.techtarget.com/definition/virtual-network-functions>`__ |
+| VNF | `Virtual Network Function <https://searchnetworking.techtarget.com/definition/virtual-network-functions-VNF>`__ |
+--------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| VNFC | Virtual Network Function Component |
+--------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+