More internal extension method renaming