This is a somewhat complicated topic, but at least this specific term is part of this soon-to-be RFC:
https://tools.ietf.org/html/draft-knodel-terminology-05
Of course compatibility classes and macros would need to stay around for the life time of KF6.
If the classes can't be changed, at least the public-facing terminology should be changed.