Rename library from scylla-cpp-driver to scylladb

Change the library artifact name to 'scylladb', avoiding both
hyphens and underscores. This eliminates the need for the
underscore-to-hyphen rename that was causing issues on Windows.

The Cargo [lib] name is now 'scylladb', producing libscylladb.so,
libscylladb.a, scylladb.dll directly. The SONAME becomes
libscylladb.so.<major>.

The pkg-config module names change accordingly:
  scylla-cpp-driver   -> scylladb
  scylla-cpp-driver_static -> scylladb_static

Package names (DEB/RPM) remain 'scylla-cpp-driver' unchanged.

Author: wprzytula

.github/workflows/build-lint-and-test.yml

@@ -11,10 +11,9 @@ env:
   RUST_BACKTRACE: full
   RUST_LOG: trace
   # Should include `INTEGRATION_TEST_BIN` from the `Makefile`
-  # TODO: Remove `build/libscylla-cpp-driver.*` after https://github.com/scylladb/cpp-rs-driver/issues/164 is fixed.
-  INTEGRATION_TEST_BIN: |
+  # TODO: Remove `build/libscylladb.*` after https://github.com/scylladb/cpp-rs-driver/issues/164 is fixed.
     build/cassandra-integration-tests
-    build/libscylla-cpp-driver.*
+    build/libscylladb.*
   INTEGRATION_TEST_BIN_CACHE_KEY: integration-test-bin-${{ github.sha }}
   # Goes to `Makefile` to let it pickup cached binary
   DONT_REBUILD_INTEGRATION_BIN: true

CMakeLists.txt

@@ -105,12 +105,12 @@ if(CASS_BUILD_EXAMPLES)
 endif()
 
 # Determine which driver target should be used as a dependency
-set(PROJECT_LIB_NAME_TARGET scylla-cpp-driver)
+set(PROJECT_LIB_NAME_TARGET scylladb)
 if(CASS_USE_STATIC_LIBS OR
    (WIN32 AND (CASS_BUILD_INTEGRATION_TESTS OR CASS_BUILD_UNIT_TESTS)))
   set(CASS_USE_STATIC_LIBS ON) # Not all driver internals are exported for test executable (e.g. CASS_EXPORT)
   set(CASS_BUILD_STATIC ON)
-  set(PROJECT_LIB_NAME_TARGET scylla-cpp-driver_static)
+  set(PROJECT_LIB_NAME_TARGET scylladb_static)
 endif()
 
 # Ensure the driver is configured to build

Makefile

@@ -564,12 +564,12 @@ test-package-rpm: build-package
 			$(MAKE) -C $(SMOKE_TEST_DIR) remove-driver-dev-rpm || true; \
 			$(MAKE) -C $(SMOKE_TEST_DIR) remove-driver-rpm || true; \
 			$(MAKE) -C $(SMOKE_TEST_DIR) install-driver-dev-rpm; \
-			pc_file=$$(find /usr -name "scylla-cpp-driver.pc" 2>/dev/null | head -1); \
+			pc_file=$$(find /usr -name "scylladb.pc" 2>/dev/null | head -1); \
 			if [ -n "$$pc_file" ]; then \
 				pc_dir=$$(dirname "$$pc_file"); \
 				export PKG_CONFIG_PATH="$${pc_dir}:$${PKG_CONFIG_PATH:-}"; \
 			fi; \
-			lib_dir=$$(find /usr -name "libscylla-cpp-driver.so*" 2>/dev/null | head -1 | xargs dirname 2>/dev/null || true); \
+			lib_dir=$$(find /usr -name "libscylladb.so*" 2>/dev/null | head -1 | xargs dirname 2>/dev/null || true); \
 			if [ -n "$$lib_dir" ]; then \
 				export LD_LIBRARY_PATH="$${lib_dir}:$${LD_LIBRARY_PATH:-}"; \
 			fi; \

cmake/CMakeCargo.cmake

@@ -19,30 +19,30 @@
 #    │                          │     │                              │
 #    │ OUTPUT:                  │     │ OUTPUT:                      │
 #    │  .../<profile>/          │     │  .../<profile>/              │
-#    │  libscylla_cpp_driver.a  │     │  libscylla_cpp_driver.so     │
+#    │  libscylladb.a           │     │  libscylladb.so              │
 #    └────────────┬─────────────┘     └──────────────┬───────────────┘
 #                 │                                  │
 #    ┌────────────▼─────────────┐     ┌──────────────▼───────────────┐
-#    │ scylla_cpp_driver        │     │ scylla_cpp_driver            │
+#    │ scylladb                 │     │ scylladb                     │
 #    │ _staticlib_target        │     │ _cdylib_target               │
 #    │ (custom target, ALL)     │     │ (custom target, ALL)         │
 #    └────────────┬─────────────┘     └──────────────┬───────────────┘
 #                 │                                  │
 #    ┌────────────▼─────────────┐     ┌──────────────▼───────────────┐
-#    │ scylla_cpp_driver        │     │ scylla_cpp_driver            │
+#    │ scylladb                 │     │ scylladb                     │
 #    │ _staticlib               │     │ _cdylib                      │
 #    │ (STATIC IMPORTED)        │     │ (SHARED IMPORTED)            │
 #    │                          │     │                              │
 #    │ IMPORTED_LOCATION:       │     │ IMPORTED_LOCATION:           │
 #    │  .../<profile>/          │     │  .../<profile>/              │
-#    │  libscylla_cpp_driver.a  │     │  libscylla_cpp_driver.so     │
+#    │  libscylladb.a           │     │  libscylladb.so              │
 #    └────────────┬─────────────┘     └──────────────┬───────────────┘
 #                 │                                  │
 #      $<TARGET_FILE:…>                   $<TARGET_FILE:…>
 #      (used by create_copy)              (used by create_copy)
 #                 │                                  │
 #    ┌────────────▼─────────────┐     ┌──────────────▼───────────────┐
-#    │ libscylla-cpp-driver     │     │ libscylla-cpp-driver         │
+#    │ libscylladb              │     │ libscylladb                  │
 #    │ _static.a_copy           │     │ .so.X.Y.Z_copy              │
 #    │ (custom target, ALL)     │     │ (custom target, ALL)         │
 #    │                          │     │                              │
@@ -51,12 +51,12 @@
 #    └────────────┬─────────────┘     └──────────────┬───────────────┘
 #                 │                                  │
 #    ┌────────────▼─────────────┐     ┌──────────────▼───────────────┐
-#    │ scylla-cpp-driver_static │     │ scylla-cpp-driver            │
+#    │ scylladb_static          │     │ scylladb                     │
 #    │ (STATIC IMPORTED)        │     │ (SHARED IMPORTED)            │
 #    │                          │     │                              │
 #    │ IMPORTED_LOCATION:       │     │ IMPORTED_LOCATION:           │
-#    │  build/libscylla-cpp-    │     │  build/libscylla-cpp-        │
-#    │  driver_static.a         │     │  driver.so.X.Y.Z            │
+#    │  build/libscylladb       │     │  build/libscylladb           │
+#    │  _static.a               │     │  .so.X.Y.Z                  │
 #    └────────────┬─────────────┘     │                              │
 #                 │                   │ + symlinks:                  │
 #                 │                   │  .so.X  →  .so.X.Y.Z       │
@@ -80,19 +80,18 @@
 #         _cdylib_target                  artifacts; give the build system a
 #         (custom targets, ALL)           named handle to order on.
 #
-#  (3)   scylla_cpp_driver_staticlib /   IMPORTED targets wrapping the raw cargo
-#         scylla_cpp_driver_cdylib       output paths. Exist solely so that
+#  (3)   scylladb_staticlib /            IMPORTED targets wrapping the raw cargo
+#         scylladb_cdylib                output paths. Exist solely so that
 #         (IMPORTED libraries)            create_copy can use $<TARGET_FILE:…>
 #                                         generator expressions to get the path.
 #
-#  (4)   _copy targets                    Copy + rename from Cargo's underscore
-#         (custom targets, ALL)           naming (libscylla_cpp_driver.so) to
-#                                         conventional C library naming
-#                                         (libscylla-cpp-driver.so.X.Y.Z) in
-#                                         the build root.
+#  (4)   _copy targets                    Copy + rename from Cargo's output
+#         (custom targets, ALL)           (libscylladb.so) to versioned naming
+#                                         (libscylladb.so.X.Y.Z) in the build
+#                                         root.
 #
-#  (5)   scylla-cpp-driver_static /       Final IMPORTED targets pointing at the
-#         scylla-cpp-driver               renamed copies. These are what the
+#  (5)   scylladb_static /                Final IMPORTED targets pointing at the
+#         scylladb                        renamed copies. These are what the
 #         (IMPORTED libraries)            rest of the build system links against.
 #
 # ============================================================================

packaging/smoke-test-app/CMakeLists.txt

@@ -9,7 +9,7 @@ get_filename_component(CPP_DRIVER_ROOT "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE)
 get_filename_component(CPP_DRIVER_ROOT "${CPP_DRIVER_ROOT}/.." ABSOLUTE)
 
 find_package(PkgConfig REQUIRED)
-pkg_check_modules(SCYLLA_CPP_DRIVER REQUIRED IMPORTED_TARGET scylla-cpp-driver)
+pkg_check_modules(SCYLLA_CPP_DRIVER REQUIRED IMPORTED_TARGET scylladb)
 
 option(SCYLLA_SMOKE_BUILD_STATIC
   "Build statically linked smoke test executable" OFF)
@@ -19,7 +19,7 @@ if(DEFINED PKG_CONFIG_USE_STATIC_LIBS)
   set(_pkg_config_use_static_libs_saved "${PKG_CONFIG_USE_STATIC_LIBS}")
 endif()
 set(PKG_CONFIG_USE_STATIC_LIBS ON)
-pkg_check_modules(SCYLLA_CPP_DRIVER_STATIC IMPORTED_TARGET scylla-cpp-driver_static)
+pkg_check_modules(SCYLLA_CPP_DRIVER_STATIC IMPORTED_TARGET scylladb_static)
 if(_pkg_config_use_static_libs_saved)
   set(PKG_CONFIG_USE_STATIC_LIBS "${_pkg_config_use_static_libs_saved}")
 else()
@@ -191,13 +191,13 @@ if(SCYLLA_SMOKE_BUILD_STATIC)
     message(FATAL_ERROR "pkg-config executable not available for static linkage")
   endif()
   execute_process(
-    COMMAND ${PKG_CONFIG_EXECUTABLE} --libs --static scylla-cpp-driver_static
+    COMMAND ${PKG_CONFIG_EXECUTABLE} --libs --static scylladb_static
     OUTPUT_VARIABLE _smoke_static_libs_output
     RESULT_VARIABLE _smoke_static_libs_result
     OUTPUT_STRIP_TRAILING_WHITESPACE)
   if(NOT _smoke_static_libs_result EQUAL 0 OR _smoke_static_libs_output STREQUAL "")
     message(FATAL_ERROR
-      "Unable to resolve static link flags from scylla-cpp-driver_static pkg-config metadata")
+      "Unable to resolve static link flags from scylladb_static pkg-config metadata")
   endif()
   separate_arguments(_smoke_static_link_libraries UNIX_COMMAND "${_smoke_static_libs_output}")
   if(NOT WIN32)

packaging/smoke-test-app/Makefile

@@ -342,7 +342,7 @@ install-driver-msi:
 install-driver-dev-msi: install-driver-msi
 
 verify-driver-dev-msi:
-	@pwsh.exe -NoProfile -Command "\$$ErrorActionPreference = 'Stop'; \$$installPath = '$(DRIVER_INSTALL_PATH)'; \$$headerPath = Join-Path \$$installPath 'include\cassandra.h'; if (-not (Test-Path \$$headerPath)) { throw 'ERROR: cassandra.h header not found at \$$headerPath - dev package may not be installed' }; \$$pkgConfigPath = Join-Path \$$installPath 'lib\pkgconfig\scylla-cpp-driver.pc'; if (-not (Test-Path \$$pkgConfigPath)) { throw 'ERROR: scylla-cpp-driver.pc not found at \$$pkgConfigPath - dev package may not be installed' }; Write-Host 'Dev package verification successful'"
+	@pwsh.exe -NoProfile -Command "\$$ErrorActionPreference = 'Stop'; \$$installPath = '$(DRIVER_INSTALL_PATH)'; \$$headerPath = Join-Path \$$installPath 'include\cassandra.h'; if (-not (Test-Path \$$headerPath)) { throw 'ERROR: cassandra.h header not found at \$$headerPath - dev package may not be installed' }; \$$pkgConfigPath = Join-Path \$$installPath 'lib\pkgconfig\scylladb.pc'; if (-not (Test-Path \$$pkgConfigPath)) { throw 'ERROR: scylladb.pc not found at \$$pkgConfigPath - dev package may not be installed' }; Write-Host 'Dev package verification successful'"
 
 ifeq ($(OS_TYPE),macos)
 install-driver: install-driver-pkg
@@ -420,10 +420,10 @@ remove-driver-pkg:
 
 remove-driver-dev-dmg:
 	sudo rm -f /usr/local/include/cassandra.h 2>/dev/null || true
-	sudo rm -f /usr/local/lib/pkgconfig/scylla-cpp-driver.pc 2>/dev/null || true
+	sudo rm -f /usr/local/lib/pkgconfig/scylladb.pc 2>/dev/null || true
 
 remove-driver-dmg:
-	sudo rm -f /usr/local/lib/libscylla-cpp-driver.* 2>/dev/null || true
+	sudo rm -f /usr/local/lib/libscylladb.* 2>/dev/null || true
 
 remove-app-dmg:
 	sudo rm -f /usr/local/bin/scylla-cpp-driver-smoke-test 2>/dev/null || true

scylla-rust-wrapper/CMakeLists.txt

@@ -32,41 +32,41 @@ if(CASS_BUILD_INTEGRATION_TESTS OR CASS_BUILD_EXAMPLES)
 endif()
 
 if(APPLE)
-  set(INSTALL_NAME_SHARED "libscylla-cpp-driver.${PROJECT_VERSION_STRING}.dylib")
-  set(INSTALL_NAME_SHARED_SYMLINK_VERSION "libscylla-cpp-driver.${PROJECT_VERSION_MAJOR}.dylib")
-  set(INSTALL_NAME_SHARED_SYMLINK_NO_VERSION "libscylla-cpp-driver.dylib")
-  set(CMAKE_Rust_FLAGS_SONAME "-Clink-arg=-Wl,-install_name,@rpath/libscylla-cpp-driver.${PROJECT_VERSION_MAJOR}.dylib -Clink-arg=-Wl,-current_version,${PROJECT_VERSION_STRING} -Clink-arg=-Wl,-compatibility_version,${PROJECT_VERSION_MAJOR}")
+  set(INSTALL_NAME_SHARED "libscylladb.${PROJECT_VERSION_STRING}.dylib")
+  set(INSTALL_NAME_SHARED_SYMLINK_VERSION "libscylladb.${PROJECT_VERSION_MAJOR}.dylib")
+  set(INSTALL_NAME_SHARED_SYMLINK_NO_VERSION "libscylladb.dylib")
+  set(CMAKE_Rust_FLAGS_SONAME "-Clink-arg=-Wl,-install_name,@rpath/libscylladb.${PROJECT_VERSION_MAJOR}.dylib -Clink-arg=-Wl,-current_version,${PROJECT_VERSION_STRING} -Clink-arg=-Wl,-compatibility_version,${PROJECT_VERSION_MAJOR}")
 elseif(WIN32)
-  set(INSTALL_NAME_SHARED "scylla-cpp-driver.dll")
-  set(INSTALL_NAME_SHARED_IMPLIB "scylla-cpp-driver.lib")
+  set(INSTALL_NAME_SHARED "scylladb.dll")
+  set(INSTALL_NAME_SHARED_IMPLIB "scylladb.lib")
   set(CMAKE_Rust_FLAGS_SONAME "")
 else()
-  set(INSTALL_NAME_SHARED "libscylla-cpp-driver.so.${PROJECT_VERSION_STRING}")
-  set(INSTALL_NAME_SHARED_SYMLINK_VERSION "libscylla-cpp-driver.so.${PROJECT_VERSION_MAJOR}")
-  set(INSTALL_NAME_SHARED_SYMLINK_NO_VERSION "libscylla-cpp-driver.so")
-  set(CMAKE_Rust_FLAGS_SONAME "-Clink-arg=-Wl,-soname=libscylla-cpp-driver.so.${PROJECT_VERSION_MAJOR}")
+  set(INSTALL_NAME_SHARED "libscylladb.so.${PROJECT_VERSION_STRING}")
+  set(INSTALL_NAME_SHARED_SYMLINK_VERSION "libscylladb.so.${PROJECT_VERSION_MAJOR}")
+  set(INSTALL_NAME_SHARED_SYMLINK_NO_VERSION "libscylladb.so")
+  set(CMAKE_Rust_FLAGS_SONAME "-Clink-arg=-Wl,-soname=libscylladb.so.${PROJECT_VERSION_MAJOR}")
 endif()
 if(WIN32)
-  set(INSTALL_NAME_STATIC "scylla-cpp-driver_static.lib")
+  set(INSTALL_NAME_STATIC "scylladb_static.lib")
 else()
-  set(INSTALL_NAME_STATIC "libscylla-cpp-driver_static.a")
+  set(INSTALL_NAME_STATIC "libscylladb_static.a")
 endif()
 if(DEFINED CMAKE_Rust_FLAGS)
   set(CMAKE_Rust_FLAGS "${CMAKE_Rust_FLAGS} ${CMAKE_Rust_FLAGS_SONAME}")
 else()
   set(CMAKE_Rust_FLAGS "${CMAKE_Rust_FLAGS_SONAME}")
 endif()
 if(CASS_BUILD_SHARED)
-  cargo_build(NAME scylla_cpp_driver CRATE_TYPE cdylib)
-  create_copy($<TARGET_FILE:scylla_cpp_driver_cdylib> ${INSTALL_NAME_SHARED})
-  add_library(scylla-cpp-driver SHARED IMPORTED GLOBAL)
-  add_dependencies(scylla-cpp-driver ${INSTALL_NAME_SHARED}_copy)
-  set_target_properties(scylla-cpp-driver PROPERTIES IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/${INSTALL_NAME_SHARED})
+  cargo_build(NAME scylladb CRATE_TYPE cdylib)
+  create_copy($<TARGET_FILE:scylladb_cdylib> ${INSTALL_NAME_SHARED})
+  add_library(scylladb SHARED IMPORTED GLOBAL)
+  add_dependencies(scylladb ${INSTALL_NAME_SHARED}_copy)
+  set_target_properties(scylladb PROPERTIES IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/${INSTALL_NAME_SHARED})
   if(WIN32)
-    get_target_property(SCYLLA_CPP_DRIVER_IMPLIB scylla_cpp_driver_cdylib IMPORTED_IMPLIB)
-    if(SCYLLA_CPP_DRIVER_IMPLIB)
-      create_copy(${SCYLLA_CPP_DRIVER_IMPLIB} ${INSTALL_NAME_SHARED_IMPLIB})
-      set_target_properties(scylla-cpp-driver PROPERTIES IMPORTED_IMPLIB ${CMAKE_BINARY_DIR}/${INSTALL_NAME_SHARED_IMPLIB})
+    get_target_property(SCYLLADB_IMPLIB scylladb_cdylib IMPORTED_IMPLIB)
+    if(SCYLLADB_IMPLIB)
+      create_copy(${SCYLLADB_IMPLIB} ${INSTALL_NAME_SHARED_IMPLIB})
+      set_target_properties(scylladb PROPERTIES IMPORTED_IMPLIB ${CMAKE_BINARY_DIR}/${INSTALL_NAME_SHARED_IMPLIB})
     endif()
   endif()
   if(NOT WIN32)
@@ -75,11 +75,11 @@ if(CASS_BUILD_SHARED)
   endif()
 endif()
 if(CASS_BUILD_STATIC)
-  cargo_build(NAME scylla_cpp_driver CRATE_TYPE staticlib)
-  create_copy($<TARGET_FILE:scylla_cpp_driver_staticlib> ${INSTALL_NAME_STATIC})
-  add_library(scylla-cpp-driver_static STATIC IMPORTED GLOBAL)
-  add_dependencies(scylla-cpp-driver_static ${INSTALL_NAME_STATIC}_copy)
-  set_target_properties(scylla-cpp-driver_static PROPERTIES IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/${INSTALL_NAME_STATIC})
+  cargo_build(NAME scylladb CRATE_TYPE staticlib)
+  create_copy($<TARGET_FILE:scylladb_staticlib> ${INSTALL_NAME_STATIC})
+  add_library(scylladb_static STATIC IMPORTED GLOBAL)
+  add_dependencies(scylladb_static ${INSTALL_NAME_STATIC}_copy)
+  set_target_properties(scylladb_static PROPERTIES IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/${INSTALL_NAME_STATIC})
 endif()
 
 #-------------------------------------
@@ -156,7 +156,7 @@ if(CASS_BUILD_SHARED)
         COMPONENT ${SCYLLA_DRIVER_DEV_COMPONENT_NAME})
     endif()
   else()
-    install(FILES $<TARGET_FILE:scylla-cpp-driver>
+    install(FILES $<TARGET_FILE:scylladb>
       DESTINATION ${CMAKE_INSTALL_LIBDIR}
       COMPONENT ${SCYLLA_DRIVER_RUNTIME_COMPONENT_NAME}
       PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ)
@@ -172,8 +172,8 @@ if(CASS_BUILD_SHARED)
   # pkg-config file goes to dev package
   if(CASS_INSTALL_PKG_CONFIG)
     if(PKG_CONFIG_FOUND)
-      configure_file("${CMAKE_CURRENT_SOURCE_DIR}/scylla-cpp-driver.pc.in" "scylla-cpp-driver.pc" @ONLY)
-      install(FILES "${CMAKE_CURRENT_BINARY_DIR}/scylla-cpp-driver.pc"
+      configure_file("${CMAKE_CURRENT_SOURCE_DIR}/scylladb.pc.in" "scylladb.pc" @ONLY)
+      install(FILES "${CMAKE_CURRENT_BINARY_DIR}/scylladb.pc"
         DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
         COMPONENT ${SCYLLA_DRIVER_DEV_COMPONENT_NAME})
     endif()
@@ -182,14 +182,14 @@ endif()
 
 # Static library goes to dev package
 if(CASS_BUILD_STATIC)
-  install(FILES $<TARGET_FILE:scylla-cpp-driver_static>
+  install(FILES $<TARGET_FILE:scylladb_static>
     DESTINATION ${CMAKE_INSTALL_LIBDIR}
     COMPONENT ${SCYLLA_DRIVER_DEV_COMPONENT_NAME})
   # Static library pkg-config file goes to dev package
   if(CASS_INSTALL_PKG_CONFIG)
     if(PKG_CONFIG_FOUND)
-      configure_file("${CMAKE_CURRENT_SOURCE_DIR}/scylla-cpp-driver_static.pc.in" "scylla-cpp-driver_static.pc" @ONLY)
-      install(FILES "${CMAKE_CURRENT_BINARY_DIR}/scylla-cpp-driver_static.pc"
+      configure_file("${CMAKE_CURRENT_SOURCE_DIR}/scylladb_static.pc.in" "scylladb_static.pc" @ONLY)
+      install(FILES "${CMAKE_CURRENT_BINARY_DIR}/scylladb_static.pc"
         DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
         COMPONENT ${SCYLLA_DRIVER_DEV_COMPONENT_NAME})
     endif()

scylla-rust-wrapper/Cargo.toml

@@ -47,7 +47,7 @@ ntest = "0.9.3"
 rusty-fork = "0.3.0"
 
 [lib]
-name = "scylla_cpp_driver"
+name = "scylladb"
 crate-type = ["cdylib", "staticlib", "lib"]
 
 [profile.dev]

…lla-rust-wrapper/scylla-cpp-driver.pc.in scylla-rust-wrapper/scylladb.pc.inscylla-rust-wrapper/scylla-cpp-driver.pc.in renamed to scylla-rust-wrapper/scylladb.pc.in scylla-rust-wrapper/scylla-cpp-driver.pc.in renamed to scylla-rust-wrapper/scylladb.pc.in

@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: scylla-cpp-rs-driver
+Name: scylladb
 Description: ScyllaDB CPP RS Driver
 Version: @version@
-Libs: -L${libdir} -lscylla-cpp-driver
+Libs: -L${libdir} -lscylladb
 Cflags: -I${includedir}
 URL: https://github.com/scylladb/cpp-rs-driver/

…t-wrapper/scylla-cpp-driver_static.pc.in scylla-rust-wrapper/scylladb_static.pc.inscylla-rust-wrapper/scylla-cpp-driver_static.pc.in renamed to scylla-rust-wrapper/scylladb_static.pc.in scylla-rust-wrapper/scylla-cpp-driver_static.pc.in renamed to scylla-rust-wrapper/scylladb_static.pc.in

@@ -3,10 +3,10 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: scylla-cpp-rs-driver
+Name: scylladb
 Description: ScyllaDB CPP RS Driver
 Version: @version@
 Requires: openssl
-Libs: -L${libdir} -lscylla-cpp-driver_static
+Libs: -L${libdir} -lscylladb_static
 Cflags: -I${includedir}
 URL: https://github.com/scylladb/cpp-rs-driver/