Renamed functions in grid
Completed renaming grid functions