Renamed "BufferManipulation" to "BufferManipulator"