Fix compilation errors by using the correct structure names.