Updates to support new filename convention