Changed struct naming convention