* [JAVA-13960] Clean up * [JAVA-13960] Rename classes Co-authored-by: panagiotiskakos <[email protected]>