Updated preferred naming conventions

I seem to waffle a lot on this, but I’ve switched back to the traditional BEM methodology instead of a simplified version.