Refactor: Rename macros
Refactor: Don't name unused arguments
Refactor: Remove unused DOS configurations