Class renaming, minor fixes
Merge conflicts