Some renaming in the guards and application of them in the hover
provider, the yet most errorprone component