Router renamed to Gateway.

For #179