Non empty grid names

- Added support for any non empty grid names.