Update to match BEM naming conventions

Updating base to fix invalid wrap property and update to match bem naming conventions