Rename all __default-xxx to __none-xxx