Updated naming of sample facilities

Uses persona names