Update naming conventions, and add adaptive classes for grid