Fix method calls, rename class file