Make name generic and add 4x4 cases