Renamed properties to avoid "...name.name" constructs