Adjusted some var&fn names.