Reverted Naming for Module Grid
Merge branch 'Refactor/NamingConventions' into develop