Pull/6921 renaming of gridfields

Related ticket: http://open.silverstripe.org/ticket/6921