Renamings for better names, as review-followup