Revert "Changes names for types that extend response"

This reverts commit a747948de47ed3c5553ad8d53bac8e6447847fce.