Rename of_malloc and of_calloc

The new names should be more accurate.