Renaming + Contents Corrections