add clear and fix namespace name