renamed part of classes and variables