Fix nested name issue