Resolving warnings about template names shadowing