Better support for names.