Remove underscore from variable names