namespace and use fixes