Fixed struct naming.