Rename the org and name