Back to tp() for irregular plural forms and fixed usage through out the whole code base