Added helper method to use name if nickname is nil