Revert "renamed (unused?) keywords to avoid keyword stealing"

This reverts commit b09fa43d4c1bf4b311077a183c30f72f38ae7028.