Add underscores to variable name for consistency