Fix class suffix - #665