Fixed bug with name changes not saved to xaml source