more renamings and simplification