Fix variable name and method name bugs