Update and rename struct to C++ struct