Fixed name issue