Changed struct names.