Fix case insensitivity for return types