Some name changes for wrong renaming