Changing names

Changed name of User to traits