Fix namespace and package name