Rename basket classes to not have OT prefix.