Fixed variable names sans underscore