JOJ-32 Small renaming changes