Rename extension method.
Move common code to extension methods.