Changed some struct names.