Not clear about how useful is this function rename. Please refrain doing so as part of such large code changes.