Rename a few thing