Revert "renaming to avoid conflict with stdlib"

This reverts commit dc9a95a6c3711f566faca619667937e2774a7540.
Revert "Revert "renaming to avoid conflict with stdlib""

This reverts commit 3e0ec5e5a9296bc5b1b99e6c6552765a5b203119.
Revert "Revert "Revert "renaming to avoid conflict with stdlib"""

This reverts commit ae3ddfde8bf2df09889e44522d81875404654675.