upd: some descriptions and renamings