Renaming target file for CPP refactor prep