Updated some methods and names