Adapting to new class naming strategy and bootstrap namespacing