Made names more sensible