Fixed undersocres in var names messing with auto complete