Fix functions using variables with underscores