Made names more explicit