Fixed unit name issue