More changes related to _ as prefix and not suffix for ivars