Fixed sizes of names again