RTI Links

Updated the RTI links to something more semantic.

@martinfilliau could you tell me why this code is horrible please... I know it breaks tests.