Renamings

generic object is not complete, huge w.i.p.