Rename 18 and 19
Add variants 20 and 21