Move class-name conversion to utils