package and property name fixes