Fix formatting errors

Many dashes were switched with underscores (and vice-versa). Cleaning them up as I find them.