Fix up name loading