refactor - stage #1 - change wording to schema - decouple site identifier