Use the updated grid functions
Use the new naming convention in master