some renaming as discussed