Rename a couple of structs