Grid improvement
Better naming convention for grid classes