Renamed functions starting with g: to start with s: now.