Converted the rest of the S2 variables to s2.
Authored by: bugman 2011-01-12
Parent: [r12264]
Child: [r12266]
