Renaming a couple of classes and variables