Rename update

Updated naming convention for grid