get rid of name clash warnings

get rid of name clash warnings, so it compiles when compiled with warnings_as_errors.