Classes and methodes renamed