#151 fixed class names in strings