Adjusted structure and names.