fix name hiding warnings