Reworked logic for control editor to properly save internal and display name user provides.