Sorted out file naming scheme.