Tweak naming and notation
Fix CSS naming conflict