Work on zshdb and gdb for newer naming conventions