#810 Changed naming of properties