adapting to new Hive version, renamings