fix namespace after merging #46