Renaming to new scheme based on challenge #s