Add aliasing functionality for client tools. Fix bug 460.