Make name of Edit Shapes Tool consistent
BUG:420935 (cherry picked from commit 32c426056b3c40390b034acc1ae66a50d318b822)