Fixing typenames.