#52: some renamings