Uses properties, instead of ivars, since they were renamed

* fix a deprecate warning also