i’d like to add a counter point to your classification, respectfully: i felt like the comment implies that morality can be subjective (mainstream), but ethics is objective.
my point would be ethics is also subjective, and thus morality and ethics can be used interchangeably. in german, they are! (Ethik und Moral/Moralität)