Updated some method names to follow naming convention