Function name fixes and conversion towards Common::FormatString