Make lookup index respect the moved names