Often people will use "aerobraking" in the context of landing a space ship or probe on a planet with atmosphere. This appears to be a casual and technically incorrect usage, for example from https://en.wiktionary.org/wiki/Appendix:Glossary_of_atmospheric_reentry:
aerobraking
when the free molecular gas of a planet's upper atmosphere is used to reshape the orbit of a spacecraft. Heating due to aerobraking is normally insignificant thus requiring no special thermal protection. The term aerobraking is often used incorrectly by people outside the aerospace industry.
And also of relevance:
aerocapture
when the continuum gas of a planet's atmosphere is used to dissipate the kinetic energy of a spacecraft entering from a heliocentric hyperbolic trajectory and which then skips out of the atmosphere into an elliptical orbit centered around the capturing planet.
I haven't found any contradiction to aerobraking referring specifically to gentle orbital reshaping. But what then is the correct way to refer to using a planet's atmosphere as a brake during entry and descent?