Change struct names