Register the name locally as well.
Merge bug25910