More consistent use of camelCase. [1660]