We should keep the java class name to facilitate the process of tracking back commit history.
Signed-off-by: Dakkshesh <beakthoven@gmail.com>