repo renaming related fixes