fix struct naming