Renaming variables, method fixes