Add aliases for servers

Signed-off-by: Aniket Pant <me@aniketpant.com>
General update before revamp