Made SIPS naming more consistent