renaming
several correction