fix namespace from master merge