Added name label handling