changed type attr in classes since type is a keyword
changed type var for class attributes