Refactor files

Update 1.8 hash style to 1.9 hash style.

Closes #5288