Am I right in thinking you've been dealing with psychosis for a while now? I wouldn't worry too much about labels, the most important thing is that you are on the right meds & are taking steps towards recovery.