class fields names fixes