In order to make it visible that the types contain C++ members, the following types were renamed: CHANGE_MASTER_OPTIONS -> ChangeMasterOptions MASTER_SERVER_CNF -> MasterServerConfig Functions where also changed to take const refs were appropriate.