Reflect name change in other files also.  Upgrade version