Update references to moved code