I agree with reverting to the generic naming.