@name change and comment clean up