Tidying up Names

Clearing up the names of the DMCA predefs to be consistent.