More 1.5 stuff, re-renamed some classes