Fix the wordings + replace the snapshots