Change locators to a restful interface.

Don't use ; @ and # as separators.