There are different types of cettavimutti. Each refers to a particular meditation. Not all qualify as the four jhana in Samma Samadhi. You are using the name and description of one type of meditation to describe another. There is obviously a mix up.
For example, the description and name of akincanna cetovimutti can't be used as a synonym for adukkhamasukhaya cetovimuttiya, each describe a different meditation state. One of them qualify as Samma Samadhi the other one doesn't .
Another example is animitta cetovimutti. It is not the same state as adukkhamasukhaya cetovimuttiya or the ones in Samma Samadhi.
The term samatha can includes the four jhanas as well as the formless states. The formless states are not included in Samma samadhi. The reason is that they are different than the ones in Samma samadhi.
Cetavimutti includes both Samma samadhi and formless states depending on the type. Akincanna cetovimutti describes a formless state. Adukkhamasukhaya cetovimuttiya
describes the four form jhana. The description for the one state is not meant for the other.
Likewise , the description for mahaggatā cetovimuti is not for animitta cetovimutti
or Adukkhamasukhaya cetovimuttiya. Animitta cetovimutti and mahaggata cetovimutti are specific types of cetovimutti rather than different descriptions for the same state.