* Add variants back for entry names but "not" definitions