Updated the names in the enumerator, they were created in the old lazy naming scheme.