Fixed some more errors

Fixed some more errors, caused simply by renaming