Renamed strategy and decorators to provide more clarity.