Fix legacy references
Fix errors due to repo renaming