renamed some structs