Update Files and fix rename