This also includes changes to tests and some simplifications like deleting the old name logic of Definition.