Fix grid system naming convention