Rename extension types and fix extension method