fix namespace/package names