Wording and Classname fix