fix shadow warnings from clang trunk

This patch renames some constructor parameters to avoid shadow warning.