LPS-32400 - Change *ClassNames into HashMaps instead of Sets