Dash and Underscore fixes

Cleaned up labeling of l;inks and stuff by removing dashes and
underscores.