Add Source and Sink aliases
Some fixes after feedback from Russel Winder