some renaming for ver 2