Revert "Use CSS-style naming for non server controls"

This reverts commit b12b77fe9ae2d167402612aaa14f1c104b638b02.