renaming some stuff which were not anymore accurate