diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index ffde29a..d8e5913 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -43,6 +43,6 @@ jobs:
       run: bundle exec rake --trace
       env:
         REFORGE_INTEGRATION_TEST_SDK_KEY: ${{ secrets.REFORGE_INTEGRATION_TEST_SDK_KEY }}
-        PREFAB_INTEGRATION_TEST_ENCRYPTION_KEY: c87ba22d8662282abe8a0e4651327b579cb64a454ab0f4c170b45b15f049a221
+        REFORGE_INTEGRATION_TEST_ENCRYPTION_KEY: c87ba22d8662282abe8a0e4651327b579cb64a454ab0f4c170b45b15f049a221
         NOT_A_NUMBER: "abcd"
         IS_A_NUMBER: "1234"
diff --git a/.gitmodules b/.gitmodules
index 8b219b2..c4cfc6d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "test/shared-integration-test-data"]
 	path = test/shared-integration-test-data
-	url = git@github.com:ReforgeHQ/sdk-integration-test-data.git
+	url = git@github.com:ReforgeHQ/integration-test-data.git
diff --git a/lib/reforge/criteria_evaluator.rb b/lib/reforge/criteria_evaluator.rb
index bb97502..4963b5a 100644
--- a/lib/reforge/criteria_evaluator.rb
+++ b/lib/reforge/criteria_evaluator.rb
@@ -148,7 +148,7 @@ def value_from_properties(criterion, properties)
       case criterion.property_name
       when NAMESPACE_KEY
         @namespace
-      when 'prefab.current-time','reforge-sdk.current-time'
+      when 'prefab.current-time','reforge.current-time'
         Time.now.utc.to_i * 1000
       else
         properties.get(criterion.property_name)
diff --git a/lib/reforge/errors/initialization_timeout_error.rb b/lib/reforge/errors/initialization_timeout_error.rb
index c336504..caf67ad 100644
--- a/lib/reforge/errors/initialization_timeout_error.rb
+++ b/lib/reforge/errors/initialization_timeout_error.rb
@@ -4,7 +4,7 @@ module Reforge
   module Errors
     class InitializationTimeoutError < Reforge::Error
       def initialize(timeout_sec, key)
-        message = "Reforge SDK couldn't initialize in #{timeout_sec} second timeout. Trying to fetch key `#{key}`."
+        message = "Reforge couldn't initialize in #{timeout_sec} second timeout. Trying to fetch key `#{key}`."
         super(message)
       end
     end
diff --git a/lib/reforge/options.rb b/lib/reforge/options.rb
index 92934c6..31b5650 100644
--- a/lib/reforge/options.rb
+++ b/lib/reforge/options.rb
@@ -51,7 +51,7 @@ module DATASOURCES
       sources: nil,
       sdk_key: ENV['SDK_API_KEY'] || ENV['PREFAB_API_KEY'],
       namespace: '',
-      prefab_api_url: nil,
+      reforge_api_url: nil,
       on_no_default: ON_NO_DEFAULT::RAISE, # options :raise, :warn_and_return_nil,
       initialization_timeout_sec: 10, # how long to wait before on_init_failure
       on_init_failure: ON_INITIALIZATION_FAILURE::RAISE,
@@ -121,8 +121,8 @@ module DATASOURCES
         source.sub(/(belt|suspenders)\./, 'telemetry.')
       end[0]
 
-      if prefab_api_url
-        warn '[DEPRECATION] prefab_api_url is deprecated. Please provide `sources` if you need to override the default sources'
+      if reforge_api_url
+        warn '[DEPRECATION] reforge_api_url is deprecated. Please provide `sources` if you need to override the default sources'
       end
 
       case context_upload_mode
diff --git a/test/integration_test.rb b/test/integration_test.rb
index c72c972..1882cca 100644
--- a/test/integration_test.rb
+++ b/test/integration_test.rb
@@ -57,7 +57,7 @@ def last_post_endpoint
   def parse_client_overrides(overrides)
     Hash[
       (overrides || {}).map do |(k, v)|
-        if k.to_s == "prefab_api_url"
+        if k.to_s == "reforge_api_url"
           [:sources, [v]]
         else
           [k.to_sym, v]
diff --git a/test/shared-integration-test-data b/test/shared-integration-test-data
index 9c6c558..1a46717 160000
--- a/test/shared-integration-test-data
+++ b/test/shared-integration-test-data
@@ -1 +1 @@
-Subproject commit 9c6c5589646be4cd43cca09142805d9075ca1c30
+Subproject commit 1a467175565fbdffb5808f9742ce4377f357b2d6