CheckLink and name refactoring