changes to namer and typer