refactored grid structures to use c/python variable-name compatible
names