- Renamed two properties with leftovers from refactoring