Rename private static field names to start with s_