Updated input files for new default naming scheme (#2609)