Fixing World Database name-space.