Rename def, minor reorg