Fixed bugs with using link names