Adjusted all data member names to the common style