Minor renaming
Removing AckOperator from global namespace and protecting @@ to be
overridden