- Moved file-naming around in buildFileProperties()