Book: Substituted old properties and old services by the new ones.

Target: master