LPS-32110 Remove ClassName to save classNameId directly