fix warnings due to -Wunused-function
fix warning reg. "name xxx already in use"

using the names they defaults to