Update usages for `s`