Extra cdefs and renames