BEM class name updates

More BEM updates that were missed.

cc/ @stevebosworth @mpiotrowicz