Changed names to reflect reimplementation.