clean up names in css
cherry-pick from 0.2.3 branch