Fixed some false negatives, renamed some classes