Update for new filename libraries