More variable renaming, fixed invalid call