further name/type fixes