From 318ecf829eb57d736e22a7f4305dfeaeccf56d62 Mon Sep 17 00:00:00 2001
From: Milan Kolar <milan@pype.club>
Date: Thu, 1 Apr 2021 15:12:31 +0200
Subject: [PATCH 1/5] maya menu to openpype

---
 pype/hosts/maya/api/menu.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pype/hosts/maya/api/menu.py b/pype/hosts/maya/api/menu.py
index 9381043511..cb04399a35 100644
--- a/pype/hosts/maya/api/menu.py
+++ b/pype/hosts/maya/api/menu.py
@@ -8,7 +8,7 @@ from pype.api import BuildWorkfile
 import maya.cmds as cmds
 
 self = sys.modules[__name__]
-self._menu = os.environ.get('PYPE_STUDIO_NAME') or "Pype"
+self._menu = "OpenPype"
 
 log = logging.getLogger(__name__)
 

From fe4fb4ecffcc839a28cbbe59558258c5691ad48c Mon Sep 17 00:00:00 2001
From: Milan Kolar <milan@pype.club>
Date: Thu, 1 Apr 2021 15:14:39 +0200
Subject: [PATCH 2/5] houdini openpype menu

---
 pype/hosts/houdini/startup/MainMenuCommon.XML | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pype/hosts/houdini/startup/MainMenuCommon.XML b/pype/hosts/houdini/startup/MainMenuCommon.XML
index ba639a71a1..d1374cf7a3 100644
--- a/pype/hosts/houdini/startup/MainMenuCommon.XML
+++ b/pype/hosts/houdini/startup/MainMenuCommon.XML
@@ -2,7 +2,7 @@
 <mainMenu>
     <menuBar>
         <subMenu id="avalon_menu">
-            <label>Pype</label>
+            <label>OpenPype</label>
             <subMenu id="avalon_context">
                 <labelExpression><![CDATA[
 from avalon import api
@@ -19,7 +19,7 @@ from avalon.tools import contextmanager; contextmanager.show()
             <separatorItem/>
 
             <scriptItem id="avalon_create">
-                <label>Create ...</label>
+                <label>Create</label>
                 <scriptCode><![CDATA[
 from avalon.tools import creator
 creator.show()
@@ -27,7 +27,7 @@ creator.show()
             </scriptItem>
 
             <scriptItem id="avalon_load">
-                <label>Load ...</label>
+                <label>Load</label>
                 <scriptCode><![CDATA[
 from avalon.tools import cbloader
 cbloader.show(use_context=True)
@@ -35,7 +35,7 @@ cbloader.show(use_context=True)
             </scriptItem>
 
             <scriptItem id="avalon_manage">
-                <label>Manage ...</label>
+                <label>Manage</label>
                 <scriptCode><![CDATA[
 from avalon.tools import cbsceneinventory
 cbsceneinventory.show()
@@ -43,7 +43,7 @@ cbsceneinventory.show()
             </scriptItem>
 
             <scriptItem id="publish">
-                <label>Publish ...</label>
+                <label>Publish</label>
                 <scriptCode><![CDATA[
 import hou
 from avalon.tools import publish

From a3a91d896ba4f3f91097f36f2151bc8d925eee01 Mon Sep 17 00:00:00 2001
From: Milan Kolar <milan@pype.club>
Date: Thu, 1 Apr 2021 15:17:50 +0200
Subject: [PATCH 3/5] rename pype in startup scripts

---
 pype/hosts/houdini/startup/scripts/123.py | 2 +-
 pype/hosts/maya/startup/userSetup.py      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pype/hosts/houdini/startup/scripts/123.py b/pype/hosts/houdini/startup/scripts/123.py
index 144b9fdb89..6d90b8352e 100644
--- a/pype/hosts/houdini/startup/scripts/123.py
+++ b/pype/hosts/houdini/startup/scripts/123.py
@@ -3,7 +3,7 @@ import hou
 
 
 def main():
-    print("Installing Avalon ...")
+    print("Installing OpenPype ...")
     api.install(houdini)
 
 
diff --git a/pype/hosts/maya/startup/userSetup.py b/pype/hosts/maya/startup/userSetup.py
index a562d3ab9e..1603d4548e 100644
--- a/pype/hosts/maya/startup/userSetup.py
+++ b/pype/hosts/maya/startup/userSetup.py
@@ -4,7 +4,7 @@ import pype.hosts.maya.api.lib as mlib
 from maya import cmds
 
 
-print("starting PYPE usersetup")
+print("starting OpenPype usersetup")
 
 # build a shelf
 settings = get_project_settings(os.environ['AVALON_PROJECT'])
@@ -26,4 +26,4 @@ if shelf_preset:
 cmds.evalDeferred("mlib.shelf(name=shelf_preset['name'], iconPath=icon_path, preset=shelf_preset)")
 
 
-print("finished PYPE usersetup")
+print("finished OpenPype usersetup")

From f11357de244707ddbbc263bf5bd9cc67eaade61e Mon Sep 17 00:00:00 2001
From: Milan Kolar <milan@pype.club>
Date: Thu, 1 Apr 2021 15:44:28 +0200
Subject: [PATCH 4/5] Tweak menu for houdini

---
 pype/hosts/houdini/startup/MainMenuCommon.XML | 24 ++++---------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/pype/hosts/houdini/startup/MainMenuCommon.XML b/pype/hosts/houdini/startup/MainMenuCommon.XML
index d1374cf7a3..faa811de86 100644
--- a/pype/hosts/houdini/startup/MainMenuCommon.XML
+++ b/pype/hosts/houdini/startup/MainMenuCommon.XML
@@ -3,23 +3,9 @@
     <menuBar>
         <subMenu id="avalon_menu">
             <label>OpenPype</label>
-            <subMenu id="avalon_context">
-                <labelExpression><![CDATA[
-from avalon import api
-return "%s - %s" % (api.Session["AVALON_ASSET"], api.Session["AVALON_TASK"])
-]]></labelExpression>
-                <scriptItem id="avalon_context_switch">
-                    <label>Set Context</label>
-                    <scriptCode><![CDATA[
-from avalon.tools import contextmanager; contextmanager.show()
-]]></scriptCode>
-                </scriptItem>
-            </subMenu>
-
-            <separatorItem/>
 
             <scriptItem id="avalon_create">
-                <label>Create</label>
+                <label>Create ...</label>
                 <scriptCode><![CDATA[
 from avalon.tools import creator
 creator.show()
@@ -27,7 +13,7 @@ creator.show()
             </scriptItem>
 
             <scriptItem id="avalon_load">
-                <label>Load</label>
+                <label>Load ...</label>
                 <scriptCode><![CDATA[
 from avalon.tools import cbloader
 cbloader.show(use_context=True)
@@ -35,7 +21,7 @@ cbloader.show(use_context=True)
             </scriptItem>
 
             <scriptItem id="avalon_manage">
-                <label>Manage</label>
+                <label>Manage ...</label>
                 <scriptCode><![CDATA[
 from avalon.tools import cbsceneinventory
 cbsceneinventory.show()
@@ -43,7 +29,7 @@ cbsceneinventory.show()
             </scriptItem>
 
             <scriptItem id="publish">
-                <label>Publish</label>
+                <label>Publish ...</label>
                 <scriptCode><![CDATA[
 import hou
 from avalon.tools import publish
@@ -55,7 +41,7 @@ publish.show(parent)
             <separatorItem/>
 
             <scriptItem id="workfiles">
-                <label>Work Files</label>
+                <label>Work Files ...</label>
                 <scriptCode><![CDATA[
 import hou, os
 from pype.tools import workfiles

From b9c10f1f82524cd58a447bdda3956ef9cfc8d701 Mon Sep 17 00:00:00 2001
From: Milan Kolar <milan@pype.club>
Date: Thu, 1 Apr 2021 15:50:37 +0200
Subject: [PATCH 5/5] change Menu label to variable

---
 pype/hosts/maya/api/menu.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pype/hosts/maya/api/menu.py b/pype/hosts/maya/api/menu.py
index cb04399a35..60ae951708 100644
--- a/pype/hosts/maya/api/menu.py
+++ b/pype/hosts/maya/api/menu.py
@@ -8,7 +8,7 @@ from pype.api import BuildWorkfile
 import maya.cmds as cmds
 
 self = sys.modules[__name__]
-self._menu = "OpenPype"
+self._menu = os.environ.get("AVALON_LABEL")
 
 log = logging.getLogger(__name__)