Name and samll changes