Revise RPC launch mappings
Merge pull request #406 from rjc123/newsites

Revise RPC launch mappings