Name function corrected