Renames and remove withOkCode