Fixed some references in psiStubs model