Small variable name fixes