Renaming, and bugs correction