change structure and names