Move SYM_NAME into the header file. Fix bugs.