Some refactoring (class names, DataMember renaming, scopes)