added underscores to valid variable names