Rename some fixes