adjusted naming to match BEM more