Update variables to match C naming conventions