rename nameWithDefault to nameOrDefault