Fix css polyfill kind

Also did a bit of renaming