Renaming some definitions