Rename 'four' items
Clean up some logic
Bump version