I agree - call CPP and ask what it takes to shift to CS. You may find it is hard or risky. (if so, something related like CIS may be an option). If you get the sense you will be stuck at CPP without access to a program that works for you, UCR is a very good school