Fixing name function from previous commit...