diff --git a/pype/hooks/pre_global_host_data.py b/pype/hooks/pre_global_host_data.py
index 74be208367..876c5840e7 100644
--- a/pype/hooks/pre_global_host_data.py
+++ b/pype/hooks/pre_global_host_data.py
@@ -32,7 +32,7 @@ class GlobalHostDataHook(PreLaunchHook):
             "project_name": self.data["project_name"],
             "asset_name": self.data["asset_name"],
             "task_name": self.data["task_name"],
-            "app_name": app.app_name,
+
             "app": app,
 
             "dbcon": self.data["dbcon"],
diff --git a/pype/lib/applications.py b/pype/lib/applications.py
index 161198a85d..36d3722701 100644
--- a/pype/lib/applications.py
+++ b/pype/lib/applications.py
@@ -418,7 +418,7 @@ class LaunchHook:
                 return False
 
         if cls.app_groups:
-            if launch_context.app_group not in cls.app_groups:
+            if launch_context.app_group.name not in cls.app_groups:
                 return False
 
         if cls.app_names:
@@ -445,11 +445,11 @@ class LaunchHook:
 
     @property
     def app_group(self):
-        return getattr(self.application, "app_group", None)
+        return getattr(self.application, "group", None)
 
     @property
     def app_name(self):
-        return getattr(self.application, "app_name", None)
+        return getattr(self.application, "name", None)
 
     def validate(self):
         """Optional validation of launch hook on initialization.
@@ -718,7 +718,7 @@ class ApplicationLaunchContext:
 
     @property
     def app_name(self):
-        return self.application.app_name
+        return self.application.name
 
     @property
     def host_name(self):
@@ -726,7 +726,7 @@ class ApplicationLaunchContext:
 
     @property
     def app_group(self):
-        return self.application.app_group
+        return self.application.group
 
     @property
     def manager(self):
@@ -1060,7 +1060,8 @@ def prepare_context_environments(data):
         "AVALON_ASSET": asset_doc["name"],
         "AVALON_TASK": task_name,
         "AVALON_APP": app.host_name,
-        "AVALON_APP_NAME": app.app_name,
+        # TODO this hould be `app.full_name` in future PRs
+        "AVALON_APP_NAME": app.name,
         "AVALON_WORKDIR": workdir
     }
     log.debug(
diff --git a/pype/modules/ftrack/event_handlers_user/action_applications.py b/pype/modules/ftrack/event_handlers_user/action_applications.py
index 5b6657793a..2c42cadfb7 100644
--- a/pype/modules/ftrack/event_handlers_user/action_applications.py
+++ b/pype/modules/ftrack/event_handlers_user/action_applications.py
@@ -133,8 +133,8 @@ class AppplicationsAction(BaseAction):
                     app_icon = None
 
             items.append({
-                "label": app.label,
-                "variant": app.variant_label,
+                "label": app.group.label,
+                "variant": app.label,
                 "description": None,
                 "actionIdentifier": self.identifier + app_name,
                 "icon": app_icon
diff --git a/pype/tools/launcher/models.py b/pype/tools/launcher/models.py
index d1742014ef..c617c7cace 100644
--- a/pype/tools/launcher/models.py
+++ b/pype/tools/launcher/models.py
@@ -162,9 +162,9 @@ class ActionModel(QtGui.QStandardItemModel):
                 (ApplicationAction,),
                 {
                     "application": app,
-                    "name": app.app_name,
-                    "label": app.label,
-                    "label_variant": app.variant_label,
+                    "name": app.name,
+                    "label": app.group.label,
+                    "label_variant": app.label,
                     "group": None,
                     "icon": app.icon,
                     "color": getattr(app, "color", None),