diff --git a/osm_common/dataclasses/temporal_dataclasses.py b/osm_common/dataclasses/temporal_dataclasses.py
index a0e3d19..8694fa7 100644
--- a/osm_common/dataclasses/temporal_dataclasses.py
+++ b/osm_common/dataclasses/temporal_dataclasses.py
@@ -384,9 +384,9 @@
 
 
 @dataclass
-class ChangeNFStateInput:
+class ChangeVnfStateInput:
     """
-    Input dataclass for creating a Juju Model.
+    Input dataclass for changing NF State.
 
     Attributes:
     -----------
@@ -394,7 +394,7 @@
         The UUID of the VNF which is stored in the OSM vnfrs
         collection in Mongo.
 
-    nf_state : VnfState
+    state : VnfState
         A representation of the VNF state (STOPPED or STARTED).
     """
 
@@ -403,9 +403,9 @@
 
 
 @dataclass
-class ChangeNFInstantiationStateInput:
+class ChangeVnfInstantiationStateInput:
     """
-    Input dataclass for creating a Juju Model.
+    Input dataclass for changing NF Instantiation State.
 
     Attributes:
     -----------
@@ -413,7 +413,7 @@
         The UUID of the VNF which is stored in the OSM vnfrs
         collection in Mongo.
 
-    nf_instantiation_state : VnfInstantiationState
+    state : VnfInstantiationState
         A representation of the VNF instantiation state (NOT_INSTANTIATED or INSTANTIATED).
 
     """
diff --git a/osm_common/temporal_constants.py b/osm_common/temporal_constants.py
index a953119..a4697a2 100644
--- a/osm_common/temporal_constants.py
+++ b/osm_common/temporal_constants.py
@@ -38,9 +38,9 @@
 ACTIVITY_GET_MODEL_INFO = "get-model-info"
 ACTIVITY_DEPLOY_CHARM = "deploy-charm"
 ACTIVITY_CHECK_CHARM_STATUS = "check-charm-status"
-ACTIVITY_CHANGE_NF_STATE = "change_nf_state"
-ACTIVITY_CHANGE_NF_INSTANTIATION_STATE = "change_nf_instantiation_state"
-ACTIVITY_CHANGE_NF_NOTIFICATION_STATE = "change_nf_notification_state"
+ACTIVITY_CHANGE_VNF_STATE = "change-vnf-state"
+ACTIVITY_CHANGE_VNF_INSTANTIATION_STATE = "change-vnf-instantiation-state"
+ACTIVITY_SEND_NOTIFICATION_FOR_VNF = "send-notification-for-vnf"
 ACTIVITY_GET_TASK_QUEUE = "get_task_queue"
 
 # Workflows