End tag is incorrectly changed when adding property

[ShadowDancer]

<Grid>
   <$
</Grid>

Assume $ is cursor. User types "Grid.ColumnDefinitions".
Expected result:

<Grid>
   <Grid.ColumnDefinitions
</Grid>

Actual result:

<Grid>
   <Grid.ColumnDefinitions
</Grid.ColumnDefinitions>

This happens because "RenameEndTag" text manipulation matches <Grid.> with end tag, and it does not know, that user is typing Grid property and he will close that tag in future. I see 2 potential ways to solve this:

1. When renaming tags, do not add . It will work, but may cut some useful features (ie. may rename tag partially, when user wants to add . - renaming Grid.ColumnDefinitions to Grid.RowDefinitions etc.)
2. Give more context for xml analyzer, so it knows that tags won't match, like this:

<Grid> <!-- depth 0 -->
   <$  <!-- depth 1 -->
</Grid> <!-- depth 0 -->