diff --git a/src/DynamoCoreWpf/Controls/DynamoNodeButton.cs b/src/DynamoCoreWpf/Controls/DynamoNodeButton.cs
index a0e0f49c675..3b2b4dc6fc5 100644
--- a/src/DynamoCoreWpf/Controls/DynamoNodeButton.cs
+++ b/src/DynamoCoreWpf/Controls/DynamoNodeButton.cs
@@ -7,6 +7,7 @@
 using Dynamo.UI;
 using Dynamo.Utilities;
 using Dynamo.ViewModels;
+using Dynamo.Wpf.Utilities;
 
 namespace Dynamo.Nodes
 {
@@ -28,6 +29,17 @@ private DynamoViewModel DynamoViewModel
             }
         }
 
+        private Window Owner
+        {
+            get
+            {
+                var f = WpfUtilities.FindUpVisualTree<DynamoView>(this);
+                if (f != null) return f;
+
+                return null;
+            }
+        }
+
         public DynamoNodeButton()
         {
         }
@@ -49,9 +61,28 @@ private void OnDynamoNodeButtonClick(object sender, RoutedEventArgs e)
             // 
             if (null != this.model && (!string.IsNullOrEmpty(this.eventName)))
             {
+                MessageBoxResult result = MessageBoxResult.None;
+
+                if (eventName.Equals("RemoveInPort"))
+                {
+                    result = MessageBoxService.Show
+                    (
+                        Owner,
+                        Dynamo.Wpf.Properties.Resources.MessageRemovePythonPort,
+                        Dynamo.Wpf.Properties.Resources.RemovePythonPortWarningMessageBoxTitle,
+                        MessageBoxButton.OKCancel,
+                        MessageBoxImage.Information
+                    );
+                }
+
+                if (result == MessageBoxResult.Cancel)
+                {
+                    return;
+                }
+
                 var command = new DynamoModel.ModelEventCommand(model.GUID, eventName);
                 this.DynamoViewModel.ExecuteCommand(command);
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/DynamoCoreWpf/Controls/InPortContextMenu.xaml b/src/DynamoCoreWpf/Controls/InPortContextMenu.xaml
index bac80c11faf..155c90a7f67 100644
--- a/src/DynamoCoreWpf/Controls/InPortContextMenu.xaml
+++ b/src/DynamoCoreWpf/Controls/InPortContextMenu.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="Dynamo.UI.Controls.InPortContextMenu"
+<UserControl x:Class="Dynamo.UI.Controls.InPortContextMenu"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -100,7 +100,8 @@
                           Command="{Binding Path=UseLevelsCommand}"
                           CommandParameter="{Binding Path=IsChecked, RelativeSource={RelativeSource Self}}"
                           Content="{x:Static p:Resources.UseLevelPopupMenuItem}"
-                          IsChecked="{Binding Path=UseLevels, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+                          IsChecked="{Binding Path=UseLevels, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                          Visibility="{Binding IsPythonNodePort, Converter={StaticResource InverseBoolToVisibilityCollapsedConverter}}" />
 
                 <!--  Keep List Structure  -->
                 <CheckBox Name="KeepListStructure"
@@ -110,7 +111,8 @@
                           CommandParameter="{Binding Path=IsChecked, RelativeSource={RelativeSource Self}}"
                           Content="{x:Static p:Resources.UseLevelKeepListStructurePopupMenuItem}"
                           IsChecked="{Binding Path=ShouldKeepListStructure, Mode=OneWay}"
-                          IsEnabled="{Binding ElementName=UseLevel, Path=IsChecked}" />
+                          IsEnabled="{Binding ElementName=UseLevel, Path=IsChecked}"
+                          Visibility="{Binding IsPythonNodePort, Converter={StaticResource InverseBoolToVisibilityCollapsedConverter}}" />
 
                 <!--  Use Default Value  -->
                 <CheckBox Name="UseDefaultValue"
@@ -119,6 +121,17 @@
                           Content="{x:Static p:Resources.PortViewContextMenuUserDefaultValue}"
                           IsChecked="{Binding Path=UsingDefaultValue, Mode=TwoWay}"
                           Visibility="{Binding DefaultValueEnabled, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
+
+                <!--  Rename Port  -->
+                <Button Name="RenamePortButton"
+                        Margin="0,3"
+                        HorizontalAlignment="Left"
+                        Command="{Binding Path=EditPortPropertiesCommand}"
+                        Content="{x:Static p:Resources.RenamePortPopupMenuItem}"
+                        IsEnabled="{Binding RenameNodeButtonEnabled, UpdateSourceTrigger=PropertyChanged}"
+                        Visibility="{Binding RenameNodeButtonEnabled, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
+                        Style="{StaticResource PopupButtonStyle}" />
+
             </StackPanel>
         </Border>
 
diff --git a/src/DynamoCoreWpf/Controls/OutPortContextMenu.xaml b/src/DynamoCoreWpf/Controls/OutPortContextMenu.xaml
index 41dca3bfb8e..2a41da2466b 100644
--- a/src/DynamoCoreWpf/Controls/OutPortContextMenu.xaml
+++ b/src/DynamoCoreWpf/Controls/OutPortContextMenu.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="Dynamo.UI.Controls.OutPortContextMenu"
+<UserControl x:Class="Dynamo.UI.Controls.OutPortContextMenu"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -48,6 +48,16 @@
                         IsEnabled="{Binding HideWiresButtonEnabled, UpdateSourceTrigger=PropertyChanged}"
                         Style="{StaticResource PopupButtonStyle}" />
 
+                <!--  Rename Port  -->
+                <Button Name="RenamePortButton"
+                        Margin="0,3"
+                        HorizontalAlignment="Left"
+                        Command="{Binding Path=EditPortPropertiesCommand}"
+                        Content="{x:Static p:Resources.RenamePortPopupMenuItem}"
+                        IsEnabled="{Binding RenameNodeButtonEnabled, UpdateSourceTrigger=PropertyChanged}"
+                        Visibility="{Binding RenameNodeButtonEnabled, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
+                        Style="{StaticResource PopupButtonStyle}" />
+
             </StackPanel>
         </Border>
 
diff --git a/src/DynamoCoreWpf/Controls/OutPortContextMenu.xaml.cs b/src/DynamoCoreWpf/Controls/OutPortContextMenu.xaml.cs
index 378e3a8c87f..2814b5439a8 100644
--- a/src/DynamoCoreWpf/Controls/OutPortContextMenu.xaml.cs
+++ b/src/DynamoCoreWpf/Controls/OutPortContextMenu.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Windows;
 using System.Windows.Controls;
 using Dynamo.ViewModels;
@@ -6,7 +6,7 @@
 namespace Dynamo.UI.Controls
 {
     /// <summary>
-    /// Interaction logic for InPortContextMenu.xaml
+    /// Interaction logic for OutPortContextMenu.xaml
     /// </summary>
     public partial class OutPortContextMenu : UserControl
     {
diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
index 542bd3fc6be..0032451cff1 100644
--- a/src/DynamoCoreWpf/DynamoCoreWpf.csproj
+++ b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
@@ -48,6 +48,7 @@
     <None Remove="Packages\SplashScreen\build\index.bundle.js" />
     <None Remove="Packages\SplashScreen\build\index.html" />
     <None Remove="UI\Images\Canvas\canvas-button-geometry-scaling.png" />
+    <None Remove="UI\Prompts\PortPropertiesEditPrompt.xaml" />
     <None Remove="Views\Core\CustomColorPicker.xaml" />
     <None Remove="Views\Core\GeometryScalingPopup.xaml" />
     <None Remove="UI\Images\question-hover-blue-16px.png" />
@@ -226,6 +227,7 @@
     <Compile Include="Controls\InPortContextMenu.xaml.cs">
       <DependentUpon>InPortContextMenu.xaml</DependentUpon>
     </Compile>
+    <Compile Include="UI\Prompts\PortPropertiesEditPrompt.xaml.cs" />
     <Compile Include="Utilities\CompactBubbleHandler.cs" />
     <Compile Include="Interfaces\IShellCom.cs" />
     <Compile Include="Rendering\HelixRenderPackage.cs" />
@@ -561,6 +563,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="UI\Prompts\PortPropertiesEditPrompt.xaml"></Page>
     <Page Include="Views\Core\CustomColorPicker.xaml">
       <CopyToOutputDirectory></CopyToOutputDirectory>
       <Generator>MSBuild:Compile</Generator>
diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
index daedb42bed2..5a99c6546de 100644
--- a/src/DynamoCoreWpf/Properties/Resources.Designer.cs
+++ b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
@@ -4444,6 +4444,24 @@ public static string MessagePackageVersionNotFound {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Cannot contain special characters (# % * ? \ : [ ]).
+        /// </summary>
+        public static string MessagePortNameInvalid {
+            get {
+                return ResourceManager.GetString("MessagePortNameInvalid", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Your custom port properties will be lost once the port is removed..
+        /// </summary>
+        public static string MessageRemovePythonPort {
+            get {
+                return ResourceManager.GetString("MessageRemovePythonPort", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to {0} cannot be installed as it conflicts with a different version of the built-in package, {1}, which is already installed.
         ///    
@@ -6499,6 +6517,60 @@ public static string PersistentVisualStatusOfLinterIssues {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Description of port.
+        /// </summary>
+        public static string PortPropertiesPromptDescriptionTooltip {
+            get {
+                return ResourceManager.GetString("PortPropertiesPromptDescriptionTooltip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Input Port Properties.
+        /// </summary>
+        public static string PortPropertiesPromptInputWindowTitle {
+            get {
+                return ResourceManager.GetString("PortPropertiesPromptInputWindowTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Port name.
+        /// </summary>
+        public static string PortPropertiesPromptNameTooltip {
+            get {
+                return ResourceManager.GetString("PortPropertiesPromptNameTooltip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Output Port Properties.
+        /// </summary>
+        public static string PortPropertiesPromptOutputWindowTitle {
+            get {
+                return ResourceManager.GetString("PortPropertiesPromptOutputWindowTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Description.
+        /// </summary>
+        public static string PortPropertiesPromptWindowDescription {
+            get {
+                return ResourceManager.GetString("PortPropertiesPromptWindowDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Name.
+        /// </summary>
+        public static string PortPropertiesPromptWindowName {
+            get {
+                return ResourceManager.GetString("PortPropertiesPromptWindowName", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Use Default Value.
         /// </summary>
@@ -7785,6 +7857,24 @@ public static string RecommendedNodes {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Remove port?.
+        /// </summary>
+        public static string RemovePythonPortWarningMessageBoxTitle {
+            get {
+                return ResourceManager.GetString("RemovePythonPortWarningMessageBoxTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Edit Port Properties.
+        /// </summary>
+        public static string RenamePortPopupMenuItem {
+            get {
+                return ResourceManager.GetString("RenamePortPopupMenuItem", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Please check if you intended to render this amount of geometry, and consider turning off the preview of other nodes within your graph, lowering the amount of Geometry you wish to render, or turning down the render precision..
         /// </summary>
diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
index f476b1f4717..619bcf5df40 100644
--- a/src/DynamoCoreWpf/Properties/Resources.en-US.resx
+++ b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
@@ -2575,6 +2575,9 @@ Do you wish to uninstall {1}? Restart {2} to complete the uninstall and try down
   <data name="BreakConnectionsPopupMenuItem" xml:space="preserve">
     <value>Break Connections</value>
   </data>
+  <data name="RenamePortPopupMenuItem" xml:space="preserve">
+    <value>Edit Port Properties</value>
+  </data>
   <data name="HideWiresPopupMenuItem" xml:space="preserve">
     <value>Hide Wires</value>
   </data>
@@ -3494,6 +3497,39 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
   <data name="DynamoViewSettingLibraryZoomScale" xml:space="preserve">
     <value>Library</value>
   </data>
+  <data name="PortPropertiesPromptInputWindowTitle">
+      <value>Input Port Properties</value>
+      <comment>Input Port title</comment>
+  </data>
+  <data name="PortPropertiesPromptOutputWindowTitle">
+      <value>Output Port Properties</value>
+      <comment>Output Port title</comment>
+  </data>
+  <data name="PortPropertiesPromptDescriptionTooltip">
+      <value>Description of port</value>
+      <comment>Description of port</comment>
+  </data>
+  <data name="PortPropertiesPromptWindowDescription">
+      <value>Description</value>
+      <comment>Port Description Label</comment>
+  </data>
+  <data name="PortPropertiesPromptNameTooltip">
+      <value>Port name</value>
+      <comment>Name of port</comment>
+  </data>
+    <data name="PortPropertiesPromptWindowName">
+      <value>Name</value>
+      <comment>Port Name Label</comment>
+  </data>
+  <data name="RemovePythonPortWarningMessageBoxTitle" xml:space="preserve">
+    <value>Remove port?</value>
+  </data>
+  <data name="MessageRemovePythonPort" xml:space="preserve">
+    <value>Your custom port properties will be lost once the port is removed.</value>
+  </data>
+  <data name="MessagePortNameInvalid" xml:space="preserve">
+    <value>Cannot contain special characters (# % * ? \ : [ ])</value>
+  </data>
   <data name="PreferencesViewEnablePersistExtensions" xml:space="preserve">
     <value>On launch, remember open extensions panels from last session</value>
   </data>
diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
index 59dee160e7f..92aaa7f6b78 100644
--- a/src/DynamoCoreWpf/Properties/Resources.resx
+++ b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -2276,6 +2276,9 @@ Next assemblies were loaded several times:
   <data name="BreakConnectionsPopupMenuItem" xml:space="preserve">
     <value>Break Connections</value>
   </data>
+  <data name="RenamePortPopupMenuItem" xml:space="preserve">
+    <value>Edit Port Properties</value>
+  </data>
   <data name="HideWiresPopupMenuItem" xml:space="preserve">
     <value>Hide Wires</value>
   </data>
@@ -3481,6 +3484,39 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
   <data name="DynamoViewSettingLibraryZoomScale" xml:space="preserve">
     <value>Library</value>
   </data>
+  <data name="PortPropertiesPromptInputWindowTitle">
+      <value>Input Port Properties</value>
+      <comment>Input Port title</comment>
+  </data>
+  <data name="PortPropertiesPromptOutputWindowTitle">
+      <value>Output Port Properties</value>
+      <comment>Output Port title</comment>
+  </data>
+  <data name="PortPropertiesPromptDescriptionTooltip">
+      <value>Description of port</value>
+      <comment>Description of port</comment>
+  </data>
+  <data name="PortPropertiesPromptWindowDescription">
+      <value>Description</value>
+      <comment>Port Description Label</comment>
+  </data>
+  <data name="PortPropertiesPromptNameTooltip">
+      <value>Port name</value>
+      <comment>Name of port</comment>
+  </data>
+  <data name="PortPropertiesPromptWindowName">
+      <value>Name</value>
+      <comment>Port Name Label</comment>
+  </data>
+  <data name="RemovePythonPortWarningMessageBoxTitle" xml:space="preserve">
+    <value>Remove port?</value>
+  </data>
+  <data name="MessageRemovePythonPort" xml:space="preserve">
+    <value>Your custom port properties will be lost once the port is removed.</value>
+  </data>
+  <data name="MessagePortNameInvalid" xml:space="preserve">
+    <value>Cannot contain special characters (# % * ? \ : [ ])</value>
+  </data>
   <data name="PreferencesViewEnablePersistExtensions" xml:space="preserve">
     <value>On launch, remember open extensions panels from last session</value>
   </data>
diff --git a/src/DynamoCoreWpf/UI/Converters.cs b/src/DynamoCoreWpf/UI/Converters.cs
index 50387a02f5d..a77aca173c2 100644
--- a/src/DynamoCoreWpf/UI/Converters.cs
+++ b/src/DynamoCoreWpf/UI/Converters.cs
@@ -3544,6 +3544,31 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu
         }
     }
 
+    /// <summary>
+    /// Converts PortType (Inport or Outport) enum to hard-coded string resources
+    /// </summary>
+    [ValueConversion(typeof(PortType), typeof(string))]
+    public class PortTypeToStringConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            switch (value)
+            {
+                case PortType.Input:
+                    return Wpf.Properties.Resources.PortPropertiesPromptInputWindowTitle;
+                case PortType.Output:
+                    return Wpf.Properties.Resources.PortPropertiesPromptOutputWindowTitle;
+                default:
+                    return "Port Properties";
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
     /// <summary>
     /// Converts a PointColletion to a Geometry so the points can be drawn using a Path
     /// </summary>
diff --git a/src/DynamoCoreWpf/UI/Prompts/PortPropertiesEditPrompt.xaml b/src/DynamoCoreWpf/UI/Prompts/PortPropertiesEditPrompt.xaml
new file mode 100644
index 00000000000..4008e0d78b6
--- /dev/null
+++ b/src/DynamoCoreWpf/UI/Prompts/PortPropertiesEditPrompt.xaml
@@ -0,0 +1,276 @@
+<Window x:Class="UI.Prompts.PortPropertiesEditPrompt"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:UI.Prompts"
+        xmlns:p="clr-namespace:Dynamo.Wpf.Properties;assembly=DynamoCoreWpf"
+        xmlns:ui="clr-namespace:Dynamo.UI"
+        mc:Ignorable="d"
+        Width="450"
+        WindowStartupLocation="CenterOwner"
+        WindowStyle="None">
+    <Window.Background>
+        <SolidColorBrush Opacity="0" />
+    </Window.Background>
+    <Window.AllowsTransparency>True</Window.AllowsTransparency>
+    <Window.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ui:SharedResourceDictionary Source="{x:Static ui:SharedDictionaryManager.DynamoModernDictionaryUri}" />
+                <ui:SharedResourceDictionary Source="{x:Static ui:SharedDictionaryManager.DynamoConvertersDictionaryUri}" />
+                <ui:SharedResourceDictionary Source="{x:Static ui:SharedDictionaryManager.DynamoColorsAndBrushesDictionaryUri}" />
+            </ResourceDictionary.MergedDictionaries>
+            <Style x:Key="HintingInputStyle" TargetType="TextBox">
+                <Setter Property="Margin" Value="0,0,0,12" />
+                <Setter Property="MinWidth" Value="62px" />
+                <Setter Property="OverridesDefaultStyle" Value="True" />
+                <Setter Property="Cursor" Value="IBeam" />
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="TextBox">
+                            <Grid>
+                                <TextBox x:Name="InputTextBox"
+                                     Padding="8,10"
+                                     Background="#353535"
+                                     BorderThickness="0"
+                                     CaretBrush="{StaticResource Blue300Brush}"
+                                     Focusable="True"
+                                     FontFamily="{StaticResource ArtifaktElementRegular}"
+                                     FontSize="12px"
+                                     Foreground="{StaticResource PrimaryCharcoal200Brush}"
+                                     MaxLength="{TemplateBinding MaxLength}"
+                                     Tag="{TemplateBinding Tag}"
+                                     Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Text, UpdateSourceTrigger=PropertyChanged}"
+                                     TextWrapping="Wrap" />
+                                <TextBlock x:Name="WatermarkLabel"
+                                       Padding="10"
+                                       FontFamily="{StaticResource ArtifaktElementRegular}"
+                                       FontSize="12px"
+                                       Foreground="{StaticResource PrimaryCharcoal200Brush}"
+                                       IsHitTestVisible="False"
+                                       Opacity="0.5"
+                                       Text="{TemplateBinding Tag}">
+                                    <TextBlock.Style>
+                                        <Style TargetType="{x:Type TextBlock}">
+                                            <Setter Property="Visibility" Value="Collapsed" />
+                                            <Style.Triggers>
+                                                <DataTrigger Binding="{Binding Text, ElementName=InputTextBox}" Value="">
+                                                    <Setter Property="Visibility" Value="Visible" />
+                                                </DataTrigger>
+                                            </Style.Triggers>
+                                        </Style>
+                                    </TextBlock.Style>
+                                </TextBlock>
+                                <StackPanel Height="4px" VerticalAlignment="Bottom">
+                                    <Rectangle Name="Underline"
+                                           Height="1px"
+                                           Fill="Transparent" />
+                                    <Rectangle Name="UnderlineShadow"
+                                           Height="3px"
+                                           Fill="Transparent" />
+                                </StackPanel>
+                            </Grid>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="IsFocused" Value="True">
+                                    <Setter TargetName="Underline" Property="Rectangle.Fill" Value="{StaticResource Blue300Brush}" />
+                                    <Setter TargetName="UnderlineShadow" Property="Rectangle.Fill" Value="#497386" />
+                                </Trigger>
+                                <Trigger Property="IsMouseOver" Value="True">
+                                    <Setter TargetName="Underline" Property="Rectangle.Fill" Value="#9B9B9B" />
+                                    <Setter TargetName="UnderlineShadow" Property="Rectangle.Fill" Value="#6E6E6E" />
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+                <Style.Triggers>
+                    <Trigger Property="IsMouseOver" Value="False">
+                        <Setter Property="BorderBrush" Value="{StaticResource DarkMidGreyBrush}" />
+                    </Trigger>
+                </Style.Triggers>
+            </Style>
+            <Style TargetType="FrameworkElement" x:Key="VisibleAnimation">
+                <Setter Property="Opacity" Value="0"></Setter>
+                <Style.Triggers>
+                    <DataTrigger Binding="{Binding Path=IsStatusWarning}" Value="True">
+                        <DataTrigger.EnterActions>
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <DoubleAnimation Storyboard.TargetProperty="Opacity"
+                                                     From="0" To="1" Duration="0:0:0.3"/>
+                                </Storyboard>
+                            </BeginStoryboard>
+                        </DataTrigger.EnterActions>
+                        <DataTrigger.ExitActions>
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <DoubleAnimation Storyboard.TargetProperty="Opacity"
+                                                     From="1" To="0" Duration="0:0:0.3"/>
+                                </Storyboard>
+                            </BeginStoryboard>
+                        </DataTrigger.ExitActions>
+                    </DataTrigger>
+                </Style.Triggers>
+            </Style>
+        </ResourceDictionary>
+    </Window.Resources>
+
+    <Grid Name="mainGrid">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="58px" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+
+        <!--  Top Section: Title + Close Button  -->
+        <Border Name="titleBar"
+                Grid.Row="0"
+                Grid.RowSpan="3"
+                Background="{StaticResource DarkMidGreyBrush}"
+                CornerRadius="4"
+                MouseDown="FunctionNamePrompt_MouseDown">
+            <DockPanel HorizontalAlignment="Stretch">
+
+                <!--  Close Button  -->
+                <Button x:Name="closeButton"
+                        Margin="0,20,25,20"
+                        VerticalAlignment="Top"
+                        Click="Cancel_Click"
+                        DockPanel.Dock="Right"
+                        KeyboardNavigation.IsTabStop="False"
+                        Style="{DynamicResource CloseButtonStyle}" />
+
+                <!--  Dialog Title  -->
+                <TextBlock x:Name="headerTitle"
+                           Margin="25,16"
+                           VerticalAlignment="Top"
+                           DockPanel.Dock="Left"
+                           FontFamily="{StaticResource ArtifaktElementRegular}"
+                           FontSize="20px"
+                           FontWeight="Regular"
+                           Foreground="{StaticResource PreferencesWindowFontColor}"
+                           Text="{Binding PortType, Converter={StaticResource PortTypeToStringConverter}, UpdateSourceTrigger=PropertyChanged}"
+                           TextAlignment="Left" />
+            </DockPanel>
+        </Border>
+
+        <!--  Middle Section: Details  -->
+        <Border Grid.Row="1"
+                Background="{StaticResource DarkMidGreyBrush}"
+                BorderBrush="#7E7E7E"
+                BorderThickness="0,1,0,0">
+            <StackPanel Margin="25,10,28,10">
+
+                <!--  Name  -->
+                <TextBlock Name="TitleLabel"
+                           Margin="0,10,0,5"
+                           Style="{StaticResource LabelStyle}"
+                           Text="{x:Static p:Resources.PortPropertiesPromptWindowName}">
+                    <TextBlock.ToolTip>
+                        <ToolTip Content="{x:Static p:Resources.PortPropertiesPromptNameTooltip}" Style="{StaticResource GenericToolTipLight}" />
+                    </TextBlock.ToolTip>
+                </TextBlock>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="*" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <TextBox Name="nameBox"
+                             Grid.Row="0"
+                             MinHeight="37"
+                             Margin="0"
+                             VerticalAlignment="Center"
+                             IsHitTestVisible="True"
+                             Style="{StaticResource HintingInputStyle}"
+                             TextChanged="NameBox_OnTextChanged" />
+                    <StackPanel x:Name="ErrorUnderline"
+                                VerticalAlignment="Bottom"
+                                Grid.Row="0"
+                                Style="{StaticResource VisibleAnimation}">
+                        <Rectangle Name="Underline"
+                                   Height="1px"
+                                   VerticalAlignment="Bottom"
+                                   Fill="#EA5555" />
+                        <Rectangle Name="UnderlineShadow"
+                                   Height="3px"
+                                   Fill="#EA5555"
+                                   Opacity="0.5" />
+                    </StackPanel>
+                    <StackPanel x:Name="ErrorMessage"
+                                Grid.Row="1"
+                                Orientation="Horizontal"
+                                VerticalAlignment="Top"
+                                Margin="0 6 0 0"
+                                Style="{StaticResource VisibleAnimation}">
+                        <Image x:Name="ErrorIcon"
+                               Width="16"
+                               Height="16"
+                               Margin="5,4,0,0"
+                               VerticalAlignment="Top"
+                               DockPanel.Dock="Right"
+                               Source="/DynamoCoreWpf;component/UI/Images/error.png" />
+
+                        <!--  Status Label  -->
+                        <TextBlock Name="statusLabel"
+                                   Margin="10,6,5,0"
+                                   VerticalAlignment="Top"
+                                   FontFamily="{StaticResource ArtifaktElementRegular}"
+                                   FontSize="10"
+                                   Style="{StaticResource LabelStyle}"
+                                   Text="{Binding ErrorString, UpdateSourceTrigger=PropertyChanged}"
+                                   TextTrimming="CharacterEllipsis">
+                            <TextBlock.ToolTip>
+                                <ToolTip Content="{Binding ErrorString, UpdateSourceTrigger=PropertyChanged}" Style="{StaticResource GenericToolTipLight}"/>
+                            </TextBlock.ToolTip>
+                        </TextBlock>
+                     </StackPanel>
+                </Grid>
+
+                <!--  Description  -->
+                <TextBlock Name="DescriptionLabel"
+                           Margin="0,10,0,5"
+                           Style="{StaticResource LabelStyle}"
+                           Text="{x:Static p:Resources.PortPropertiesPromptWindowDescription}">
+                    <TextBlock.ToolTip>
+                        <ToolTip Content="{x:Static p:Resources.PortPropertiesPromptDescriptionTooltip}" Style="{StaticResource GenericToolTipLight}" />
+                    </TextBlock.ToolTip>
+                </TextBlock>
+                <TextBox Name="DescriptionInput"
+                         MinHeight="75"
+                         AcceptsReturn="True"
+                         MinLines="3"
+                         Style="{DynamicResource HintingInputStyle}"
+                         TextWrapping="Wrap"
+                         VerticalScrollBarVisibility="Auto" />
+            </StackPanel>
+        </Border>
+
+        <!--  Lower Section: Buttons  -->
+        <DockPanel Grid.Row="2" Margin="0,0,25,25">
+            <Button Name="cancelButton"
+                    MinWidth="85"
+                    Margin="0"
+                    Background="Transparent"
+                    Click="Cancel_Click"
+                    Content="{x:Static p:Resources.CancelButton}"
+                    DockPanel.Dock="Right"
+                    Foreground="White"
+                    IsCancel="True"
+                    Style="{DynamicResource ResourceKey=CtaButtonStyle}"
+                    TabIndex="3" />
+            <Button Name="okButton"
+                    MinWidth="75"
+                    Background="#0596D7"
+                    BorderBrush="#0596D7"
+                    Click="OK_Click"
+                    Content="{x:Static p:Resources.Save}"
+                    DockPanel.Dock="Right"
+                    Foreground="White"
+                    IsDefault="True"
+                    Style="{DynamicResource ResourceKey=CtaButtonStyle}"
+                    TabIndex="2"
+                    IsEnabled="{Binding IsStatusWarning, Converter={StaticResource InverseBooleanConverter}}"/>
+        </DockPanel>
+    </Grid>
+</Window>
diff --git a/src/DynamoCoreWpf/UI/Prompts/PortPropertiesEditPrompt.xaml.cs b/src/DynamoCoreWpf/UI/Prompts/PortPropertiesEditPrompt.xaml.cs
new file mode 100644
index 00000000000..ee5920a083b
--- /dev/null
+++ b/src/DynamoCoreWpf/UI/Prompts/PortPropertiesEditPrompt.xaml.cs
@@ -0,0 +1,221 @@
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using Dynamo.Controls;
+using Dynamo.Utilities;
+using Dynamo.Wpf.Utilities;
+using DynamoUtilities;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using Dynamo.Core;
+using Dynamo.Graph.Nodes;
+
+namespace UI.Prompts
+{
+    /// <summary>
+    /// Interaction logic for PortPropertiesEditPrompt.xaml
+    /// </summary>
+    public partial class PortPropertiesEditPrompt : Window, INotifyPropertyChanged
+    {
+        #region Properties
+        private PortType portType;
+        private bool isStatusWarning;
+        private string errorString = string.Empty;
+
+        /// <summary>
+        /// Port name
+        /// </summary>
+        public string PortName
+        {
+            get { return nameBox.Text; }
+        }
+        /// <summary>
+        /// Port Description
+        /// </summary>
+        public string Description
+        {
+            get { return DescriptionInput.Text; }
+        }
+
+        /// <summary>
+        /// Port Type
+        /// </summary>
+        public PortType PortType
+        {
+            get
+            {
+                return portType;
+            }
+            set
+            {
+                portType = value;
+                OnPropertyChanged(new PropertyChangedEventArgs(nameof(PortType)));
+            }
+        }
+
+        /// <summary>
+        /// Shows if the port name validation has gone through or not
+        /// </summary>
+        public bool IsStatusWarning
+        {
+            get
+            {
+                return isStatusWarning;
+            }
+            set
+            {
+                isStatusWarning = value;
+                OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsStatusWarning)));
+            }
+        }
+
+
+        private Window owner
+        {
+            get
+            {
+                var f = WpfUtilities.FindUpVisualTree<DynamoView>(this);
+                if (f != null) return f;
+
+                return null;
+            }
+        }
+
+
+        /// <summary>
+        /// Contains the notification of the status label
+        /// </summary>
+        public string ErrorString
+        {
+            get { return errorString; }
+            set
+            {
+                errorString = value;
+                OnPropertyChanged(new PropertyChangedEventArgs(nameof(ErrorString)));
+            }
+        }
+        /// <summary>
+        /// Contains the names of all ports
+        /// Used in name validation check
+        /// </summary>
+        internal List<string> OutPortNames { get; set; }
+        public event PropertyChangedEventHandler PropertyChanged;
+        #endregion
+
+        public PortPropertiesEditPrompt()
+        {
+            InitializeComponent();
+            
+            this.DataContext = this;
+            this.WindowStartupLocation = WindowStartupLocation.CenterScreen;
+
+            Owner = WpfUtilities.FindUpVisualTree<DynamoView>(this);
+            WindowStartupLocation = WindowStartupLocation.CenterOwner;
+
+            nameBox.Focus();
+        }
+
+        #region Methods
+        void OK_Click(object sender, RoutedEventArgs e)
+        {
+            // Prevent the prompt from closing if the validation conditions are not satisfied
+            if (ValidatePortName(PortName))
+            {
+                return;
+            }
+
+            DialogResult = !string.IsNullOrEmpty(PortName);
+        }
+
+        void Cancel_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = false;
+        }
+
+        /// <summary>
+        /// Allows for the dragging of this custom-styled window. 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FunctionNamePrompt_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            // Drag functionality when the TitleBar is clicked with the left button and dragged to another place
+            if (e.ChangedButton == MouseButton.Left)
+            {
+                DragMove();
+            }
+        }
+
+        // Name validation 
+        private void NameBox_OnTextChanged(object sender, TextChangedEventArgs e)
+        {
+            e.Handled = true;
+            if (ValidatePortName(nameBox.Text))
+            {
+                IsStatusWarning = true;
+            }
+            else
+            {
+                IsStatusWarning = false;
+            }
+        }
+        
+        // Run all name validation checks here
+        private bool ValidatePortName(string name)
+        {
+            if (IsPortNameInValid(name))
+            {
+                ErrorString = Dynamo.Wpf.Properties.Resources.MessagePortNameInvalid;
+                return true;
+            }
+            if (!IsPortNameUnique(name))
+            {
+                ErrorString = Dynamo.Wpf.Properties.Resources.MessagePortNameInvalid;
+                return true;
+            }
+            if (IsPortNameNumber(name))
+            {
+                ErrorString = Dynamo.Wpf.Properties.Resources.MessagePortNameInvalid;
+                return true;
+            }
+
+            return false;
+        }
+
+
+        public bool IsPortNameInValid(string portName)
+        {
+            if (DynamoUtilities.PathHelper.IsFileNameInValid(portName))
+                return true;
+
+            return false;
+        }
+
+        // Check if the name is a number
+        private bool IsPortNameNumber(string name)
+        {
+            return int.TryParse(name, out _);
+        }
+
+        // Check if the name is unique
+        private bool IsPortNameUnique(string name)
+        {
+            if (OutPortNames != null && OutPortNames.Any())
+            {
+                return !OutPortNames.Contains(name);
+            }
+
+            return true;
+        }
+
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            var propertyChanged = this.PropertyChanged;
+            if (propertyChanged != null)
+                propertyChanged(this, e);
+        }
+        #endregion
+
+    }
+}
diff --git a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoConverters.xaml b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoConverters.xaml
index c292360073a..5d246e75adc 100644
--- a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoConverters.xaml
+++ b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoConverters.xaml
@@ -187,4 +187,5 @@
     <controls:ListHasMoreThanNItemsToVisibilityConverter x:Key="ListHasMoreThanNItemsToVisibilityConverter" />
     <controls:ObjectTypeConverter x:Key="ObjectTypeConverter" />
     <controls:TextForegroundSaturationColorConverter x:Key="TextForegroundSaturationColorConverter" />
+    <controls:PortTypeToStringConverter x:Key="PortTypeToStringConverter" />
 </ResourceDictionary>
diff --git a/src/DynamoCoreWpf/UI/Themes/Modern/Ports.xaml b/src/DynamoCoreWpf/UI/Themes/Modern/Ports.xaml
index db4e1479d41..e1e05db8fc5 100644
--- a/src/DynamoCoreWpf/UI/Themes/Modern/Ports.xaml
+++ b/src/DynamoCoreWpf/UI/Themes/Modern/Ports.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:command="clr-namespace:GalaSoft.MvvmLight.Command;assembly=GalaSoft.MvvmLight.Platform"
                     xmlns:configuration="clr-namespace:Dynamo.Configuration;assembly=DynamoCore"
@@ -463,6 +463,15 @@
                                         IsEnabled="{Binding HideWiresButtonEnabled, UpdateSourceTrigger=PropertyChanged}"
                                         Style="{StaticResource PopupButtonStyle}"
                                         Visibility="{Binding OutputPortConnectionsButtonsVisible, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
+
+                                <Button Margin="0,3"
+                                        HorizontalAlignment="Left"
+                                        Command="{Binding Path=EditPortPropertiesCommand}"
+                                        Content="{x:Static p:Resources.RenamePortPopupMenuItem}"
+                                        IsEnabled="{Binding RenameNodeButtonEnabled, UpdateSourceTrigger=PropertyChanged}"
+                                        Style="{StaticResource PopupButtonStyle}"
+                                        Visibility="{Binding OutputPortConnectionsButtonsVisible, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
+
                             </StackPanel>
                         </Border>
                         <Path Grid.Column="1"
@@ -484,4 +493,4 @@
             </Grid.Style>
         </Grid>
     </DataTemplate>
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>
diff --git a/src/DynamoCoreWpf/ViewModels/Core/InPortViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/InPortViewModel.cs
index 06a8699cd56..d5700b11bbc 100644
--- a/src/DynamoCoreWpf/ViewModels/Core/InPortViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/Core/InPortViewModel.cs
@@ -1,4 +1,6 @@
-using System;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows;
 using System.Windows.Media;
@@ -7,6 +9,7 @@
 using Dynamo.UI;
 using Dynamo.UI.Commands;
 using ProtoCore.Utils;
+using UI.Prompts;
 
 namespace Dynamo.ViewModels
 {
@@ -17,8 +20,10 @@ public partial class InPortViewModel : PortViewModel
         private DelegateCommand useLevelsCommand;
         private DelegateCommand keepListStructureCommand;
         private DelegateCommand portMouseLeftButtonOnLevelCommand;
+        private DelegateCommand editPortPropertiesCommand;
 
         private bool showUseLevelMenu;
+        private bool isPythonNodePort;
 
         private SolidColorBrush portValueMarkerColor = new SolidColorBrush(Color.FromArgb(255, 204, 204, 204));
 
@@ -62,6 +67,18 @@ public bool ShowUseLevelMenu
             }
         }
 
+        /// <summary>
+        /// Returns whether the port belongs to a Python node
+        /// </summary>
+        public bool IsPythonNodePort
+        {
+            get => isPythonNodePort;
+            set
+            {
+                isPythonNodePort = value;
+            }
+        }
+
         /// <summary>
         /// If UseLevel is enabled on this port.
         /// </summary>
@@ -156,6 +173,7 @@ public InPortViewModel(NodeViewModel node, PortModel port) : base(node, port)
             node.NodeModel.PropertyChanged += NodeModel_PropertyChanged;
 
             RefreshPortDefaultValueMarkerVisible();
+            IsPythonNodePort = node.NodeModel is PythonNodeModels.PythonNode;
         }
 
         private void NodeModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
@@ -209,6 +227,9 @@ private void PortPropertyChanged(object sender, System.ComponentModel.PropertyCh
                     RaisePropertyChanged(nameof(IsConnected));
                     RefreshAllInportsColors();
                     break;
+                case nameof(IsPythonNodePort):
+                    RaisePropertyChanged(nameof(IsPythonNodePort));
+                    break;
             }
         }
 
@@ -284,6 +305,53 @@ public DelegateCommand MouseLeftButtonDownOnLevelCommand
             }
         }
 
+        /// <summary>
+        /// Used by the 'Edit Port Properties' button in the node output context menu.
+        /// Triggers the Port Properties Panel
+        /// </summary>
+        public DelegateCommand EditPortPropertiesCommand
+        {
+            get
+            {
+                return editPortPropertiesCommand ??
+                       (editPortPropertiesCommand = new DelegateCommand(EditPortProperties));
+            }
+        }
+        /// <summary>
+        /// Used by the 'Edit Port Properties' button in the node output context menu.
+        /// Triggers the Port Properties Panel
+        /// </summary>
+        private void EditPortProperties(object parameter)
+        {
+            var wsViewModel = node.WorkspaceViewModel;
+
+            // Hide the popup, we no longer need it
+            wsViewModel.OnRequestPortContextMenu(ShowHideFlags.Show, this);
+
+            var dialog = new PortPropertiesEditPrompt()
+            {
+                DescriptionInput = { Text = port.ToolTip },
+                nameBox = { Text = port.Name },
+                PortType = PortType.Output,
+                OutPortNames = ListOutportNames(this.NodeViewModel.InPorts),
+            };
+
+            if (dialog.ShowDialog() != true)
+            {
+                return;
+            }
+
+            port.Name = dialog.PortName;
+            port.ToolTip = dialog.Description;
+
+            RaisePropertyChanged(nameof(PortName));
+        }
+
+        private List<string> ListOutportNames(ObservableCollection<PortViewModel> outPorts)
+        {
+            return outPorts.Where(x => !x.PortName.Equals(this.PortName)).Select(x => x.PortName).ToList();
+        }
+
         /// <summary>
         /// Handles the Mouse left button down on the level.
         /// </summary>
diff --git a/src/DynamoCoreWpf/ViewModels/Core/OutPortViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/OutPortViewModel.cs
index 14a1475447b..d16aaea87e9 100644
--- a/src/DynamoCoreWpf/ViewModels/Core/OutPortViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/Core/OutPortViewModel.cs
@@ -1,12 +1,18 @@
-using System.ComponentModel;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.Linq;
 using System.Windows;
 using System.Windows.Media;
+using DSCore;
 using Dynamo.Graph.Nodes;
 using Dynamo.Logging;
+using Dynamo.Nodes;
 using Dynamo.UI;
 using Dynamo.UI.Commands;
 using ProtoCore.Utils;
+using UI.Prompts;
+using Color = System.Windows.Media.Color;
 
 namespace Dynamo.ViewModels
 {
@@ -16,6 +22,7 @@ public partial class OutPortViewModel : PortViewModel
 
         private DelegateCommand breakConnectionsCommand;
         private DelegateCommand hideConnectionsCommand;
+        private DelegateCommand editPortPropertiesCommand;
         private DelegateCommand portMouseLeftButtonOnContextCommand;
 
         private SolidColorBrush portValueMarkerColor = new SolidColorBrush(Color.FromArgb(255, 204, 204, 204));
@@ -28,6 +35,7 @@ public partial class OutPortViewModel : PortViewModel
         private bool areConnectorsHidden;
         private string showHideWiresButtonContent = "";
         private bool hideWiresButtonEnabled;
+        private bool renameNodeButtonEnabled;
         private bool portDefaultValueMarkerVisible;
         private int valueMarkerWidth;
 
@@ -109,6 +117,19 @@ public bool HideWiresButtonEnabled
             }
         }
 
+        /// <summary>
+        ///  Enables or disables the Rename Node button on the node output port context menu.
+        /// </summary>
+        public bool RenameNodeButtonEnabled
+        {
+            get => renameNodeButtonEnabled;
+            set
+            {
+                renameNodeButtonEnabled = value;
+                RaisePropertyChanged(nameof(RenameNodeButtonEnabled));
+            }
+        }
+
         /// <summary>
         /// Sets the color of the small rectangular marker on each input port.
         /// </summary>
@@ -173,6 +194,12 @@ internal void RefreshHideWiresState()
             RaisePropertyChanged(nameof(ShowHideWiresButtonContent));
         }
 
+        internal void EnableRenamePort()
+        {
+            RenameNodeButtonEnabled = true;
+            RaisePropertyChanged(nameof(RenameNodeButtonEnabled));
+        }
+
         #endregion
 
         public OutPortViewModel(NodeViewModel node, PortModel port) :base(node, port)
@@ -181,6 +208,10 @@ public OutPortViewModel(NodeViewModel node, PortModel port) :base(node, port)
             node.NodeModel.PropertyChanged += NodeModel_PropertyChanged;
 
             RefreshHideWiresState();
+            if (node.NodeModel is PythonNodeModels.PythonNode)
+            {
+                EnableRenamePort();
+            }
         }
 
         public override void Dispose()
@@ -247,6 +278,19 @@ public DelegateCommand HideConnectionsCommand
             get { return hideConnectionsCommand ?? (hideConnectionsCommand = new DelegateCommand(HideConnections)); }
         }
 
+        /// <summary>
+        /// Used by the 'Edit Port Properties' button in the node output context menu.
+        /// Triggers the Port Properties Panel
+        /// </summary>
+        public DelegateCommand EditPortPropertiesCommand
+        {
+            get
+            {
+                return editPortPropertiesCommand ??
+                       (editPortPropertiesCommand = new DelegateCommand(EditPortProperties)); 
+            }
+        }
+
         /// <summary>
         /// Used by the 'Break Connections' button in the node output context menu.
         /// Removes any current connections this port has.
@@ -296,6 +340,41 @@ private void HideConnections(object parameter)
             RefreshHideWiresState();
         }
 
+        /// <summary>
+        /// Used by the 'Edit Port Properties' button in the node output context menu.
+        /// Triggers the Port Properties Panel
+        /// </summary>
+        private void EditPortProperties(object parameter)
+        {
+            var wsViewModel = node.WorkspaceViewModel;
+
+            // Hide the popup, we no longer need it
+            wsViewModel.OnRequestPortContextMenu(ShowHideFlags.Show, this);
+
+            var dialog = new PortPropertiesEditPrompt()
+            {
+                DescriptionInput = { Text = port.ToolTip },
+                nameBox = { Text = port.Name },
+                PortType = PortType.Output,
+                OutPortNames = ListOutportNames(this.NodeViewModel.OutPorts),
+            };
+
+            if (dialog.ShowDialog() != true)
+            {
+                return;
+            }
+
+            port.Name = dialog.PortName;
+            port.ToolTip = dialog.Description;
+
+            RaisePropertyChanged(nameof(PortName));
+        }
+
+        private List<string> ListOutportNames(ObservableCollection<PortViewModel> outPorts)
+        {
+            return outPorts.Where(x => !x.PortName.Equals(this.PortName)).Select(x => x.PortName).ToList();
+        }
+
         /// <summary>
         /// Returns true if they are hidden.
         /// </summary>
diff --git a/src/DynamoCoreWpf/ViewModels/Core/PortViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/PortViewModel.cs
index 447f6cf15a1..683d8afcc41 100644
--- a/src/DynamoCoreWpf/ViewModels/Core/PortViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/Core/PortViewModel.cs
@@ -520,9 +520,11 @@ private void NodePortContextMenu(object obj)
         {
             // If this port does not display a Chevron button to open the context menu and it doesn't
             // have a default value then using right-click to open the context menu should also do nothing.
+            // Added check for Python node model (allow input context menu for rename)
             if (obj is InPortViewModel inPortViewModel &&
                 inPortViewModel.UseLevelVisibility == Visibility.Collapsed &&
-                !inPortViewModel.DefaultValueEnabled) return;
+                !inPortViewModel.DefaultValueEnabled &&
+                !(inPortViewModel.NodeViewModel.NodeModel is PythonNodeModels.PythonNode)) return;
             
             var wsViewModel = node.WorkspaceViewModel;
             
diff --git a/src/DynamoCoreWpf/Views/Core/WorkspaceView.xaml.cs b/src/DynamoCoreWpf/Views/Core/WorkspaceView.xaml.cs
index 8bb5f1b438a..906c5f3e25f 100644
--- a/src/DynamoCoreWpf/Views/Core/WorkspaceView.xaml.cs
+++ b/src/DynamoCoreWpf/Views/Core/WorkspaceView.xaml.cs
@@ -236,8 +236,14 @@ private void ShowHidePopup(ShowHideFlags flag, Popup popup)
                             if (portViewModel is OutPortViewModel outPortViewModel)
                             {
                                 outPortViewModel.RefreshHideWiresState();
+
+                                if (portViewModel.NodeViewModel.NodeModel is PythonNodeModels.PythonNode)
+                                {
+                                    outPortViewModel.EnableRenamePort();
+                                }
                             }
 
+
                             portViewModel.SetupPortContextMenuPlacement(popup);
                         }
                     }