Consistent module name spelling in CSS/HTML
Merge remote-tracking branch 'origin/master'