Added the name label functionality