Sink should match source

Although it already does numerically, this make is more explicitly
clear.
Use natural names instead of mathematical notation