Adopt latest lsp libraries. Introduce consistent naming