Clean up naming

Cleans up formatting for some of the newer papers that were merged.