Use _class suffix consistently