Renamed variables to make more sense for rules that aren't based on the filename
 Updated config names of the existing rules; should use dashes instead of underscores (for purely aesthetic reasons)