Name and type fixes