Rename puppet and svn to short hostnames