fix namespace and bundle name