IDI-104: Rename files for more consistency.