Some instance variable renaming to more sane values