Fix build with -Wshadow option.
Replace public property names by upper-camelcase.