Rename BraintreeApi module to Braintree

https://trello.com/c/8sYwcLVX/122-rename-braintreeapi-module-to-braintree
braintree · Feb 1, 2016 · 242c986 · 242c986
1 parent 74b3249
commit 242c986
Show file tree

Hide file tree

Showing 155 changed files with 17 additions and 17 deletions.
diff --git a/BraintreeApi/build.gradle → Braintree/build.gradle b/BraintreeApi/build.gradle → Braintree/build.gradle
@@ -66,7 +66,7 @@ task runAllTests {
 }
 
 gradle.taskGraph.whenReady { taskGraph ->
-    def RUN_ALL_TESTS = taskGraph.hasTask(':BraintreeApi:runAllTests')
+    def RUN_ALL_TESTS = taskGraph.hasTask(':Braintree:runAllTests')
     android.buildTypes.debug.buildConfigField('boolean', 'RUN_ALL_TESTS', '' + RUN_ALL_TESTS)
 }
 

diff --git a/...eeApi/src/androidTest/AndroidManifest.xml → ...ntree/src/androidTest/AndroidManifest.xml b/...eeApi/src/androidTest/AndroidManifest.xml → ...ntree/src/androidTest/AndroidManifest.xml
diff --git a/.../assets/fixtures/base_64_client_token.txt → .../assets/fixtures/base_64_client_token.txt b/.../assets/fixtures/base_64_client_token.txt → .../assets/fixtures/base_64_client_token.txt
diff --git a/...oidTest/assets/fixtures/client_token.json → ...oidTest/assets/fixtures/client_token.json b/...oidTest/assets/fixtures/client_token.json → ...oidTest/assets/fixtures/client_token.json
diff --git a/...res/client_token_with_bad_config_url.json → ...res/client_token_with_bad_config_url.json b/...res/client_token_with_bad_config_url.json → ...res/client_token_with_bad_config_url.json
diff --git a/...idTest/assets/fixtures/configuration.json → ...idTest/assets/fixtures/configuration.json b/...idTest/assets/fixtures/configuration.json → ...idTest/assets/fixtures/configuration.json
diff --git a/...ixtures/configuration_with_analytics.json → ...ixtures/configuration_with_analytics.json b/...ixtures/configuration_with_analytics.json → ...ixtures/configuration_with_analytics.json
diff --git a/...tures/configuration_with_android_pay.json → ...tures/configuration_with_android_pay.json b/...tures/configuration_with_android_pay.json → ...tures/configuration_with_android_pay.json
diff --git a/...es/configuration_with_client_api_url.json → ...es/configuration_with_client_api_url.json b/...es/configuration_with_client_api_url.json → ...es/configuration_with_client_api_url.json
diff --git a/...res/configuration_with_custom_paypal.json → ...res/configuration_with_custom_paypal.json b/...res/configuration_with_custom_paypal.json → ...res/configuration_with_custom_paypal.json
diff --git a/...res/configuration_with_cvv_challenge.json → ...res/configuration_with_cvv_challenge.json b/...res/configuration_with_cvv_challenge.json → ...res/configuration_with_cvv_challenge.json
diff --git a/...s/configuration_with_disabled_paypal.json → ...s/configuration_with_disabled_paypal.json b/...s/configuration_with_disabled_paypal.json → ...s/configuration_with_disabled_paypal.json
diff --git a/...nfiguration_with_empty_analytics_url.json → ...nfiguration_with_empty_analytics_url.json b/...nfiguration_with_empty_analytics_url.json → ...nfiguration_with_empty_analytics_url.json
diff --git a/...tures/configuration_with_environment.json → ...tures/configuration_with_environment.json b/...tures/configuration_with_environment.json → ...tures/configuration_with_environment.json
diff --git a/...tures/configuration_with_live_paypal.json → ...tures/configuration_with_live_paypal.json b/...tures/configuration_with_live_paypal.json → ...tures/configuration_with_live_paypal.json
diff --git a/...nfiguration_with_merchant_account_id.json → ...nfiguration_with_merchant_account_id.json b/...nfiguration_with_merchant_account_id.json → ...nfiguration_with_merchant_account_id.json
diff --git a/...tures/configuration_with_merchant_id.json → ...tures/configuration_with_merchant_id.json b/...tures/configuration_with_merchant_id.json → ...tures/configuration_with_merchant_id.json
diff --git a/.../configuration_with_missing_coinbase.json → .../configuration_with_missing_coinbase.json b/.../configuration_with_missing_coinbase.json → .../configuration_with_missing_coinbase.json
diff --git a/...es/configuration_with_missing_paypal.json → ...es/configuration_with_missing_paypal.json b/...es/configuration_with_missing_paypal.json → ...es/configuration_with_missing_paypal.json
diff --git a/...nfiguration_with_multiple_challenges.json → ...nfiguration_with_multiple_challenges.json b/...nfiguration_with_multiple_challenges.json → ...nfiguration_with_multiple_challenges.json
diff --git a/...configuration_with_no_three_d_secure.json → ...configuration_with_no_three_d_secure.json b/...configuration_with_no_three_d_secure.json → ...configuration_with_no_three_d_secure.json
diff --git a/...es/configuration_with_offline_paypal.json → ...es/configuration_with_offline_paypal.json b/...es/configuration_with_offline_paypal.json → ...es/configuration_with_offline_paypal.json
diff --git a/...es/configuration_with_pay_with_venmo.json → ...es/configuration_with_pay_with_venmo.json b/...es/configuration_with_pay_with_venmo.json → ...es/configuration_with_pay_with_venmo.json
diff --git a/...iguration_with_paypal_touch_disabled.json → ...iguration_with_paypal_touch_disabled.json b/...iguration_with_paypal_touch_disabled.json → ...iguration_with_paypal_touch_disabled.json
diff --git a/...es/configuration_with_three_d_secure.json → ...es/configuration_with_three_d_secure.json b/...es/configuration_with_three_d_secure.json → ...es/configuration_with_three_d_secure.json
diff --git a/...ures/configuration_without_analytics.json → ...ures/configuration_without_analytics.json b/...ures/configuration_without_analytics.json → ...ures/configuration_without_analytics.json
diff --git a/...es/configuration_without_android_pay.json → ...es/configuration_without_android_pay.json b/...es/configuration_without_android_pay.json → ...es/configuration_without_android_pay.json
diff --git a/...ures/configuration_without_challenge.json → ...ures/configuration_without_challenge.json b/...ures/configuration_without_challenge.json → ...ures/configuration_without_challenge.json
diff --git a/...configuration_without_client_api_url.json → ...configuration_without_client_api_url.json b/...configuration_without_client_api_url.json → ...configuration_without_client_api_url.json
diff --git a/...es/configuration_without_environment.json → ...es/configuration_without_environment.json b/...es/configuration_without_environment.json → ...es/configuration_without_environment.json
diff --git a/...es/configuration_without_merchant_id.json → ...es/configuration_without_merchant_id.json b/...es/configuration_without_merchant_id.json → ...es/configuration_without_merchant_id.json
diff --git a/...dTest/assets/fixtures/error_response.json → ...dTest/assets/fixtures/error_response.json b/...dTest/assets/fixtures/error_response.json → ...dTest/assets/fixtures/error_response.json
diff --git a/...res/payment_methods/android_pay_card.json → ...res/payment_methods/android_pay_card.json b/...res/payment_methods/android_pay_card.json → ...res/payment_methods/android_pay_card.json
diff --git a/...nt_methods/android_pay_card_response.json → ...nt_methods/android_pay_card_response.json b/...nt_methods/android_pay_card_response.json → ...nt_methods/android_pay_card_response.json
diff --git a/...ods/get_payment_method_card_response.json → ...ods/get_payment_method_card_response.json b/...ods/get_payment_method_card_response.json → ...ods/get_payment_method_card_response.json
diff --git a/...methods/get_payment_methods_response.json → ...methods/get_payment_methods_response.json b/...methods/get_payment_methods_response.json → ...methods/get_payment_methods_response.json
diff --git a/...tures/payment_methods/paypal_account.json → ...tures/payment_methods/paypal_account.json b/...tures/payment_methods/paypal_account.json → ...tures/payment_methods/paypal_account.json
diff --git a/...ment_methods/paypal_account_response.json → ...ment_methods/paypal_account_response.json b/...ment_methods/paypal_account_response.json → ...ment_methods/paypal_account_response.json
diff --git a/...tures/payment_methods/paypal_address.json → ...tures/payment_methods/paypal_address.json b/...tures/payment_methods/paypal_address.json → ...tures/payment_methods/paypal_address.json
diff --git a/...ent_methods/paypal_address_alternate.json → ...ent_methods/paypal_address_alternate.json b/...ent_methods/paypal_address_alternate.json → ...ent_methods/paypal_address_alternate.json
diff --git a/...res/payment_methods/visa_credit_card.json → ...res/payment_methods/visa_credit_card.json b/...res/payment_methods/visa_credit_card.json → ...res/payment_methods/visa_credit_card.json
diff --git a/...nt_methods/visa_credit_card_response.json → ...nt_methods/visa_credit_card_response.json b/...nt_methods/visa_credit_card_response.json → ...nt_methods/visa_credit_card_response.json
diff --git a/...al_hermes_billing_agreement_response.json → ...al_hermes_billing_agreement_response.json b/...al_hermes_billing_agreement_response.json → ...al_hermes_billing_agreement_response.json
diff --git a/...sets/fixtures/paypal_hermes_response.json → ...sets/fixtures/paypal_hermes_response.json b/...sets/fixtures/paypal_hermes_response.json → ...sets/fixtures/paypal_hermes_response.json
diff --git a/.../assets/fixtures/paypal_otc_response.json → .../assets/fixtures/paypal_otc_response.json b/.../assets/fixtures/paypal_otc_response.json → .../assets/fixtures/paypal_otc_response.json
diff --git a/...roidTest/assets/fixtures/random_json.json → ...roidTest/assets/fixtures/random_json.json b/...roidTest/assets/fixtures/random_json.json → ...roidTest/assets/fixtures/random_json.json
diff --git a/...ree_d_secure/authentication_response.json → ...ree_d_secure/authentication_response.json b/...ree_d_secure/authentication_response.json → ...ree_d_secure/authentication_response.json
diff --git a/...e/authentication_response_with_error.json → ...e/authentication_response_with_error.json b/...e/authentication_response_with_error.json → ...e/authentication_response_with_error.json
diff --git a/...tures/three_d_secure/lookup_response.json → ...tures/three_d_secure/lookup_response.json b/...tures/three_d_secure/lookup_response.json → ...tures/three_d_secure/lookup_response.json
diff --git a/...reepayments/api/AnalyticsManagerTest.java → ...reepayments/api/AnalyticsManagerTest.java b/...reepayments/api/AnalyticsManagerTest.java → ...reepayments/api/AnalyticsManagerTest.java
diff --git a/...braintreepayments/api/AndroidPayTest.java → ...braintreepayments/api/AndroidPayTest.java b/...braintreepayments/api/AndroidPayTest.java → ...braintreepayments/api/AndroidPayTest.java
diff --git a/...eepayments/api/BraintreeFragmentTest.java → ...eepayments/api/BraintreeFragmentTest.java b/...eepayments/api/BraintreeFragmentTest.java → ...eepayments/api/BraintreeFragmentTest.java
diff --git a/...ments/api/BraintreeFragmentTestUtils.java → ...ments/api/BraintreeFragmentTestUtils.java b/...ments/api/BraintreeFragmentTestUtils.java → ...ments/api/BraintreeFragmentTestUtils.java
diff --git a/...a/com/braintreepayments/api/CardTest.java → ...a/com/braintreepayments/api/CardTest.java b/...a/com/braintreepayments/api/CardTest.java → ...a/com/braintreepayments/api/CardTest.java
diff --git a/...ayments/api/ConfigurationManagerTest.java → ...ayments/api/ConfigurationManagerTest.java b/...ayments/api/ConfigurationManagerTest.java → ...ayments/api/ConfigurationManagerTest.java
diff --git a/...intreepayments/api/DataCollectorTest.java → ...intreepayments/api/DataCollectorTest.java b/...intreepayments/api/DataCollectorTest.java → ...intreepayments/api/DataCollectorTest.java
diff --git a/...intreepayments/api/PayPalRequestTest.java → ...intreepayments/api/PayPalRequestTest.java b/...intreepayments/api/PayPalRequestTest.java → ...intreepayments/api/PayPalRequestTest.java
diff --git a/...com/braintreepayments/api/PayPalTest.java → ...com/braintreepayments/api/PayPalTest.java b/...com/braintreepayments/api/PayPalTest.java → ...com/braintreepayments/api/PayPalTest.java
diff --git a/...aintreepayments/api/ThreeDSecureTest.java → ...aintreepayments/api/ThreeDSecureTest.java b/...aintreepayments/api/ThreeDSecureTest.java → ...aintreepayments/api/ThreeDSecureTest.java
diff --git a/...nts/api/ThreeDSecureVerificationTest.java → ...nts/api/ThreeDSecureVerificationTest.java b/...nts/api/ThreeDSecureVerificationTest.java → ...nts/api/ThreeDSecureVerificationTest.java
diff --git a/...epayments/api/TokenizationClientTest.java → ...epayments/api/TokenizationClientTest.java b/...epayments/api/TokenizationClientTest.java → ...epayments/api/TokenizationClientTest.java
diff --git a/.../com/braintreepayments/api/VenmoTest.java → .../com/braintreepayments/api/VenmoTest.java b/.../com/braintreepayments/api/VenmoTest.java → .../com/braintreepayments/api/VenmoTest.java
diff --git a/...pi/exceptions/ErrorsWithResponseTest.java → ...pi/exceptions/ErrorsWithResponseTest.java b/...pi/exceptions/ErrorsWithResponseTest.java → ...pi/exceptions/ErrorsWithResponseTest.java
diff --git a/...api/internal/BraintreeHttpClientTest.java → ...api/internal/BraintreeHttpClientTest.java b/...api/internal/BraintreeHttpClientTest.java → ...api/internal/BraintreeHttpClientTest.java
diff --git a/...nternal/BraintreeHttpClientTestUtils.java → ...nternal/BraintreeHttpClientTestUtils.java b/...nternal/BraintreeHttpClientTestUtils.java → ...nternal/BraintreeHttpClientTestUtils.java
diff --git a/...ernal/SignatureVerificationTestUtils.java → ...ernal/SignatureVerificationTestUtils.java b/...ernal/SignatureVerificationTestUtils.java → ...ernal/SignatureVerificationTestUtils.java
diff --git a/...i/models/AndroidPayConfigurationTest.java → ...i/models/AndroidPayConfigurationTest.java b/...i/models/AndroidPayConfigurationTest.java → ...i/models/AndroidPayConfigurationTest.java
diff --git a/...ts/api/models/VenmoConfigurationTest.java → ...ts/api/models/VenmoConfigurationTest.java b/...ts/api/models/VenmoConfigurationTest.java → ...ts/api/models/VenmoConfigurationTest.java
diff --git a/...intreepayments/api/test/TestActivity.java → ...intreepayments/api/test/TestActivity.java b/...intreepayments/api/test/TestActivity.java → ...intreepayments/api/test/TestActivity.java
diff --git a/...yments/api/test/TestListenerActivity.java → ...yments/api/test/TestListenerActivity.java b/...yments/api/test/TestListenerActivity.java → ...yments/api/test/TestListenerActivity.java
diff --git a/...secure/ThreeDSecureWebViewClientTest.java → ...secure/ThreeDSecureWebViewClientTest.java b/...secure/ThreeDSecureWebViewClientTest.java → ...secure/ThreeDSecureWebViewClientTest.java
diff --git a/BraintreeApi/src/main/AndroidManifest.xml → Braintree/src/main/AndroidManifest.xml b/BraintreeApi/src/main/AndroidManifest.xml → Braintree/src/main/AndroidManifest.xml
diff --git a/...aintreepayments/api/AnalyticsManager.java → ...aintreepayments/api/AnalyticsManager.java b/...aintreepayments/api/AnalyticsManager.java → ...aintreepayments/api/AnalyticsManager.java
diff --git a/...com/braintreepayments/api/AndroidPay.java → ...com/braintreepayments/api/AndroidPay.java b/...com/braintreepayments/api/AndroidPay.java → ...com/braintreepayments/api/AndroidPay.java
diff --git a/...s/api/BraintreeBrowserSwitchActivity.java → ...s/api/BraintreeBrowserSwitchActivity.java b/...s/api/BraintreeBrowserSwitchActivity.java → ...s/api/BraintreeBrowserSwitchActivity.java
diff --git a/...intreepayments/api/BraintreeFragment.java → ...intreepayments/api/BraintreeFragment.java b/...intreepayments/api/BraintreeFragment.java → ...intreepayments/api/BraintreeFragment.java
diff --git a/.../java/com/braintreepayments/api/Card.java → .../java/com/braintreepayments/api/Card.java b/.../java/com/braintreepayments/api/Card.java → .../java/com/braintreepayments/api/Card.java
diff --git a/...reepayments/api/ConfigurationManager.java → ...reepayments/api/ConfigurationManager.java b/...reepayments/api/ConfigurationManager.java → ...reepayments/api/ConfigurationManager.java
diff --git a/.../braintreepayments/api/DataCollector.java → .../braintreepayments/api/DataCollector.java b/.../braintreepayments/api/DataCollector.java → .../braintreepayments/api/DataCollector.java
diff --git a/...braintreepayments/api/DeviceMetadata.java → ...braintreepayments/api/DeviceMetadata.java b/...braintreepayments/api/DeviceMetadata.java → ...braintreepayments/api/DeviceMetadata.java
diff --git a/...ava/com/braintreepayments/api/PayPal.java → ...ava/com/braintreepayments/api/PayPal.java b/...ava/com/braintreepayments/api/PayPal.java → ...ava/com/braintreepayments/api/PayPal.java
diff --git a/...m/braintreepayments/api/ThreeDSecure.java → ...m/braintreepayments/api/ThreeDSecure.java b/...m/braintreepayments/api/ThreeDSecure.java → ...m/braintreepayments/api/ThreeDSecure.java
diff --git a/...ntreepayments/api/TokenizationClient.java → ...ntreepayments/api/TokenizationClient.java b/...ntreepayments/api/TokenizationClient.java → ...ntreepayments/api/TokenizationClient.java
diff --git a/...java/com/braintreepayments/api/Venmo.java → ...java/com/braintreepayments/api/Venmo.java b/...java/com/braintreepayments/api/Venmo.java → ...java/com/braintreepayments/api/Venmo.java
diff --git a/...aintreepayments/api/annotations/Beta.java → ...aintreepayments/api/annotations/Beta.java b/...aintreepayments/api/annotations/Beta.java → ...aintreepayments/api/annotations/Beta.java
diff --git a/...tions/AppSwitchNotAvailableException.java → ...tions/AppSwitchNotAvailableException.java b/...tions/AppSwitchNotAvailableException.java → ...tions/AppSwitchNotAvailableException.java
diff --git a/...yments/api/exceptions/BraintreeError.java → ...yments/api/exceptions/BraintreeError.java b/...yments/api/exceptions/BraintreeError.java → ...yments/api/exceptions/BraintreeError.java
diff --git a/...ts/api/exceptions/BraintreeException.java → ...ts/api/exceptions/BraintreeException.java b/...ts/api/exceptions/BraintreeException.java → ...ts/api/exceptions/BraintreeException.java
diff --git a/...pi/exceptions/BrowserSwitchException.java → ...pi/exceptions/BrowserSwitchException.java b/...pi/exceptions/BrowserSwitchException.java → ...pi/exceptions/BrowserSwitchException.java
diff --git a/...pi/exceptions/ConfigurationException.java → ...pi/exceptions/ConfigurationException.java b/...pi/exceptions/ConfigurationException.java → ...pi/exceptions/ConfigurationException.java
diff --git a/...nts/api/exceptions/ErrorWithResponse.java → ...nts/api/exceptions/ErrorWithResponse.java b/...nts/api/exceptions/ErrorWithResponse.java → ...nts/api/exceptions/ErrorWithResponse.java
diff --git a/.../exceptions/GoogleApiClientException.java → .../exceptions/GoogleApiClientException.java b/.../exceptions/GoogleApiClientException.java → .../exceptions/GoogleApiClientException.java
diff --git a/.../exceptions/InvalidArgumentException.java → .../exceptions/InvalidArgumentException.java b/.../exceptions/InvalidArgumentException.java → .../exceptions/InvalidArgumentException.java
diff --git a/...s/PaymentMethodNotAvailableException.java → ...s/PaymentMethodNotAvailableException.java b/...s/PaymentMethodNotAvailableException.java → ...s/PaymentMethodNotAvailableException.java
diff --git a/...i/interfaces/BraintreeCancelListener.java → ...i/interfaces/BraintreeCancelListener.java b/...i/interfaces/BraintreeCancelListener.java → ...i/interfaces/BraintreeCancelListener.java
diff --git a/...pi/interfaces/BraintreeErrorListener.java → ...pi/interfaces/BraintreeErrorListener.java b/...pi/interfaces/BraintreeErrorListener.java → ...pi/interfaces/BraintreeErrorListener.java
diff --git a/...nts/api/interfaces/BraintreeListener.java → ...nts/api/interfaces/BraintreeListener.java b/...nts/api/interfaces/BraintreeListener.java → ...nts/api/interfaces/BraintreeListener.java
diff --git a/...interfaces/BraintreeResponseListener.java → ...interfaces/BraintreeResponseListener.java b/...interfaces/BraintreeResponseListener.java → ...interfaces/BraintreeResponseListener.java
diff --git a/...api/interfaces/ConfigurationListener.java → ...api/interfaces/ConfigurationListener.java b/...api/interfaces/ConfigurationListener.java → ...api/interfaces/ConfigurationListener.java
diff --git a/...nterfaces/PaymentMethodNonceCallback.java → ...nterfaces/PaymentMethodNonceCallback.java b/...nterfaces/PaymentMethodNonceCallback.java → ...nterfaces/PaymentMethodNonceCallback.java
diff --git a/...es/PaymentMethodNonceCreatedListener.java → ...es/PaymentMethodNonceCreatedListener.java b/...es/PaymentMethodNonceCreatedListener.java → ...es/PaymentMethodNonceCreatedListener.java
diff --git a/...s/PaymentMethodNoncesUpdatedListener.java → ...s/PaymentMethodNoncesUpdatedListener.java b/...s/PaymentMethodNoncesUpdatedListener.java → ...s/PaymentMethodNoncesUpdatedListener.java
diff --git a/...yments/api/interfaces/QueuedCallback.java → ...yments/api/interfaces/QueuedCallback.java b/...yments/api/interfaces/QueuedCallback.java → ...yments/api/interfaces/QueuedCallback.java
diff --git a/...faces/TokenizationParametersListener.java → ...faces/TokenizationParametersListener.java b/...faces/TokenizationParametersListener.java → ...faces/TokenizationParametersListener.java
diff --git a/...internal/BraintreeGatewayCertificate.java → ...internal/BraintreeGatewayCertificate.java b/...internal/BraintreeGatewayCertificate.java → ...internal/BraintreeGatewayCertificate.java
diff --git a/...nts/api/internal/BraintreeHttpClient.java → ...nts/api/internal/BraintreeHttpClient.java b/...nts/api/internal/BraintreeHttpClient.java → ...nts/api/internal/BraintreeHttpClient.java
diff --git a/...ts/api/models/AnalyticsConfiguration.java → ...ts/api/models/AnalyticsConfiguration.java b/...ts/api/models/AnalyticsConfiguration.java → ...ts/api/models/AnalyticsConfiguration.java
diff --git a/...ments/api/models/AndroidPayCardNonce.java → ...ments/api/models/AndroidPayCardNonce.java b/...ments/api/models/AndroidPayCardNonce.java → ...ments/api/models/AndroidPayCardNonce.java
diff --git a/...s/api/models/AndroidPayConfiguration.java → ...s/api/models/AndroidPayConfiguration.java b/...s/api/models/AndroidPayConfiguration.java → ...s/api/models/AndroidPayConfiguration.java
diff --git a/...reepayments/api/models/Authorization.java → ...reepayments/api/models/Authorization.java b/...reepayments/api/models/Authorization.java → ...reepayments/api/models/Authorization.java
diff --git a/...ntreepayments/api/models/CardBuilder.java → ...ntreepayments/api/models/CardBuilder.java b/...ntreepayments/api/models/CardBuilder.java → ...ntreepayments/api/models/CardBuilder.java
diff --git a/...aintreepayments/api/models/CardNonce.java → ...aintreepayments/api/models/CardNonce.java b/...aintreepayments/api/models/CardNonce.java → ...aintreepayments/api/models/CardNonce.java
diff --git a/...ntreepayments/api/models/ClientToken.java → ...ntreepayments/api/models/ClientToken.java b/...ntreepayments/api/models/ClientToken.java → ...ntreepayments/api/models/ClientToken.java
diff --git a/...reepayments/api/models/Configuration.java → ...reepayments/api/models/Configuration.java b/...reepayments/api/models/Configuration.java → ...reepayments/api/models/Configuration.java
diff --git a/...ents/api/models/PayPalAccountBuilder.java → ...ents/api/models/PayPalAccountBuilder.java b/...ents/api/models/PayPalAccountBuilder.java → ...ents/api/models/PayPalAccountBuilder.java
diff --git a/...yments/api/models/PayPalAccountNonce.java → ...yments/api/models/PayPalAccountNonce.java b/...yments/api/models/PayPalAccountNonce.java → ...yments/api/models/PayPalAccountNonce.java
diff --git a/...ments/api/models/PayPalConfiguration.java → ...ments/api/models/PayPalConfiguration.java b/...ments/api/models/PayPalConfiguration.java → ...ments/api/models/PayPalConfiguration.java
diff --git a/...nts/api/models/PayPalPaymentResource.java → ...nts/api/models/PayPalPaymentResource.java b/...nts/api/models/PayPalPaymentResource.java → ...nts/api/models/PayPalPaymentResource.java
diff --git a/...reepayments/api/models/PayPalRequest.java → ...reepayments/api/models/PayPalRequest.java b/...reepayments/api/models/PayPalRequest.java → ...reepayments/api/models/PayPalRequest.java
diff --git a/...ents/api/models/PaymentMethodBuilder.java → ...ents/api/models/PaymentMethodBuilder.java b/...ents/api/models/PaymentMethodBuilder.java → ...ents/api/models/PaymentMethodBuilder.java
diff --git a/...yments/api/models/PaymentMethodNonce.java → ...yments/api/models/PaymentMethodNonce.java b/...yments/api/models/PaymentMethodNonce.java → ...yments/api/models/PaymentMethodNonce.java
diff --git a/...reepayments/api/models/PostalAddress.java → ...reepayments/api/models/PostalAddress.java b/...reepayments/api/models/PostalAddress.java → ...reepayments/api/models/PostalAddress.java
diff --git a/...s/ThreeDSecureAuthenticationResponse.java → ...s/ThreeDSecureAuthenticationResponse.java b/...s/ThreeDSecureAuthenticationResponse.java → ...s/ThreeDSecureAuthenticationResponse.java
diff --git a/...payments/api/models/ThreeDSecureInfo.java → ...payments/api/models/ThreeDSecureInfo.java b/...payments/api/models/ThreeDSecureInfo.java → ...payments/api/models/ThreeDSecureInfo.java
diff --git a/...yments/api/models/ThreeDSecureLookup.java → ...yments/api/models/ThreeDSecureLookup.java b/...yments/api/models/ThreeDSecureLookup.java → ...yments/api/models/ThreeDSecureLookup.java
diff --git a/...epayments/api/models/TokenizationKey.java → ...epayments/api/models/TokenizationKey.java b/...epayments/api/models/TokenizationKey.java → ...epayments/api/models/TokenizationKey.java
diff --git a/...ayments/api/models/VenmoAccountNonce.java → ...ayments/api/models/VenmoAccountNonce.java b/...ayments/api/models/VenmoAccountNonce.java → ...ayments/api/models/VenmoAccountNonce.java
diff --git a/...yments/api/models/VenmoConfiguration.java → ...yments/api/models/VenmoConfiguration.java b/...yments/api/models/VenmoConfiguration.java → ...yments/api/models/VenmoConfiguration.java
diff --git a/...edsecure/ThreeDSecureWebChromeClient.java → ...edsecure/ThreeDSecureWebChromeClient.java b/...edsecure/ThreeDSecureWebChromeClient.java → ...edsecure/ThreeDSecureWebChromeClient.java
diff --git a/...api/threedsecure/ThreeDSecureWebView.java → ...api/threedsecure/ThreeDSecureWebView.java b/...api/threedsecure/ThreeDSecureWebView.java → ...api/threedsecure/ThreeDSecureWebView.java
diff --git a/...edsecure/ThreeDSecureWebViewActivity.java → ...edsecure/ThreeDSecureWebViewActivity.java b/...edsecure/ThreeDSecureWebViewActivity.java → ...edsecure/ThreeDSecureWebViewActivity.java
diff --git a/...reedsecure/ThreeDSecureWebViewClient.java → ...reedsecure/ThreeDSecureWebViewClient.java b/...reedsecure/ThreeDSecureWebViewClient.java → ...reedsecure/ThreeDSecureWebViewClient.java
diff --git a/...pi/models/AnalyticsConfigurationTest.java → ...pi/models/AnalyticsConfigurationTest.java b/...pi/models/AnalyticsConfigurationTest.java → ...pi/models/AnalyticsConfigurationTest.java
diff --git a/...s/api/models/AndroidPayCardNonceTest.java → ...s/api/models/AndroidPayCardNonceTest.java b/...s/api/models/AndroidPayCardNonceTest.java → ...s/api/models/AndroidPayCardNonceTest.java
diff --git a/...ayments/api/models/AuthorizationTest.java → ...ayments/api/models/AuthorizationTest.java b/...ayments/api/models/AuthorizationTest.java → ...ayments/api/models/AuthorizationTest.java
diff --git a/...epayments/api/models/CardBuilderTest.java → ...epayments/api/models/CardBuilderTest.java b/...epayments/api/models/CardBuilderTest.java → ...epayments/api/models/CardBuilderTest.java
diff --git a/...reepayments/api/models/CardNonceTest.java → ...reepayments/api/models/CardNonceTest.java b/...reepayments/api/models/CardNonceTest.java → ...reepayments/api/models/CardNonceTest.java
diff --git a/...epayments/api/models/ClientTokenTest.java → ...epayments/api/models/ClientTokenTest.java b/...epayments/api/models/ClientTokenTest.java → ...epayments/api/models/ClientTokenTest.java
diff --git a/...ayments/api/models/ConfigurationTest.java → ...ayments/api/models/ConfigurationTest.java b/...ayments/api/models/ConfigurationTest.java → ...ayments/api/models/ConfigurationTest.java
diff --git a/.../api/models/PayPalAccountBuilderTest.java → .../api/models/PayPalAccountBuilderTest.java b/.../api/models/PayPalAccountBuilderTest.java → .../api/models/PayPalAccountBuilderTest.java
diff --git a/...ts/api/models/PayPalAccountNonceTest.java → ...ts/api/models/PayPalAccountNonceTest.java b/...ts/api/models/PayPalAccountNonceTest.java → ...ts/api/models/PayPalAccountNonceTest.java
diff --git a/...s/api/models/PayPalConfigurationTest.java → ...s/api/models/PayPalConfigurationTest.java b/...s/api/models/PayPalConfigurationTest.java → ...s/api/models/PayPalConfigurationTest.java
diff --git a/...ayments/api/models/PayPalRequestTest.java → ...ayments/api/models/PayPalRequestTest.java b/...ayments/api/models/PayPalRequestTest.java → ...ayments/api/models/PayPalRequestTest.java
diff --git a/...ts/api/models/PaymentMethodNonceTest.java → ...ts/api/models/PaymentMethodNonceTest.java b/...ts/api/models/PaymentMethodNonceTest.java → ...ts/api/models/PaymentMethodNonceTest.java
diff --git a/...ayments/api/models/PostalAddressTest.java → ...ayments/api/models/PostalAddressTest.java b/...ayments/api/models/PostalAddressTest.java → ...ayments/api/models/PostalAddressTest.java
diff --git a/...reeDSecureAuthenticationResponseTest.java → ...reeDSecureAuthenticationResponseTest.java b/...reeDSecureAuthenticationResponseTest.java → ...reeDSecureAuthenticationResponseTest.java
diff --git a/...ts/api/models/ThreeDSecureLookupTest.java → ...ts/api/models/ThreeDSecureLookupTest.java b/...ts/api/models/ThreeDSecureLookupTest.java → ...ts/api/models/ThreeDSecureLookupTest.java
diff --git a/...ments/api/models/TokenizationKeyTest.java → ...ments/api/models/TokenizationKeyTest.java b/...ments/api/models/TokenizationKeyTest.java → ...ments/api/models/TokenizationKeyTest.java
diff --git a/...nts/api/models/VenmoAccountNonceTest.java → ...nts/api/models/VenmoAccountNonceTest.java b/...nts/api/models/VenmoAccountNonceTest.java → ...nts/api/models/VenmoAccountNonceTest.java
diff --git a/...src/test/resources/robolectric.properties → ...src/test/resources/robolectric.properties b/...src/test/resources/robolectric.properties → ...src/test/resources/robolectric.properties
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
@@ -42,10 +42,10 @@ Please note: It is not currently possible to run tests outside of Braintree.
 
 There are several components that comprise this SDK:
 
-* [BraintreeApi](BraintreeApi) provides the networking, communication and modeling layer for Braintree.
+* [Braintree](Braintree) provides the networking, communication and modeling layer for Braintree.
 * [BraintreeDataCollector](BraintreeDataCollector) collects and provides data for fraud detection.
 * [Core](Core) provides shared code across all the modules in the SDK.
-* [Drop-In](Drop-In) uses `BraintreeApi` to create a full checkout experience inside an `Activity`.
+* [Drop-In](Drop-In) uses `Braintree` to create a full checkout experience inside an `Activity`.
 * [Demo](Demo) is the reference integration of [Drop-In](Drop-In).
 * [PayPalOneTouch](PayPalOneTouch) provides support for PayPal app and browser switch.
 * [PayPalDataCollector](PayPalDataCollector) collects and provides data for PayPal fraud detection.

diff --git a/Drop-In/build.gradle b/Drop-In/build.gradle
@@ -22,7 +22,7 @@ android {
 
 dependencies {
     compile 'com.braintreepayments:card-form:2.1.1'
-    compile project(':BraintreeApi')
+    compile project(':Braintree')
     compile 'com.google.android.gms:play-services-wallet:[8.4.0,9.0.0)'
 
     androidTestCompile project(path: ':TestUtils', configuration: 'instrumentationTestDebug')

diff --git a/Rakefile b/Rakefile
@@ -1,7 +1,7 @@
 require 'rake'
 
 PAYPAL_ONE_TOUCH_BUILD_GRADLE = "PayPalOneTouch/build.gradle"
-BRAINTREE_API_BUILD_GRADLE = "BraintreeApi/build.gradle"
+BRAINTREE_API_BUILD_GRADLE = "Braintree/build.gradle"
 DROP_IN_BUILD_GRADLE = "Drop-In/build.gradle"
 
 task :default => :tests
@@ -46,17 +46,17 @@ task :publish_snapshot => :tests do
   replace_string(BRAINTREE_API_BUILD_GRADLE, "compile project(':Core')", "compile 'com.braintreepayments.api:core:#{get_current_version}'")
   replace_string(BRAINTREE_API_BUILD_GRADLE, "compile project(':BraintreeDataCollector')", "compile 'com.braintreepayments.api:data-collector:#{get_current_version}'")
   replace_string(BRAINTREE_API_BUILD_GRADLE, "compile project(':PayPalOneTouch')", "compile 'com.paypal.android.sdk:paypal-one-touch:#{get_current_version}'")
-  sh "./gradlew clean :BraintreeApi:uploadArchives"
+  sh "./gradlew clean :Braintree:uploadArchives"
 
-  replace_string(DROP_IN_BUILD_GRADLE, "compile project(':BraintreeApi')", "compile 'com.braintreepayments.api:braintree:#{get_current_version}'")
+  replace_string(DROP_IN_BUILD_GRADLE, "compile project(':Braintree')", "compile 'com.braintreepayments.api:braintree:#{get_current_version}'")
   sh "./gradlew clean :Drop-In:uploadArchives"
 
   replace_string(PAYPAL_ONE_TOUCH_BUILD_GRADLE, "compile 'com.braintreepayments.api:core:#{get_current_version}'", "compile project(':Core')")
   replace_string(PAYPAL_ONE_TOUCH_BUILD_GRADLE, "compile 'com.paypal.android.sdk:data-collector:#{get_current_version}'", "compile project(':PayPalDataCollector')")
   replace_string(BRAINTREE_API_BUILD_GRADLE, "compile 'com.braintreepayments.api:core:#{get_current_version}'", "compile project(':Core')")
   replace_string(BRAINTREE_API_BUILD_GRADLE, "compile 'com.braintreepayments.api:data-collector:#{get_current_version}'", "compile project(':BraintreeDataCollector')")
   replace_string(BRAINTREE_API_BUILD_GRADLE, "compile 'com.paypal.android.sdk:paypal-one-touch:#{get_current_version}'", "compile project(:PayPalOneTouch')")
-  replace_string(DROP_IN_BUILD_GRADLE, "compile 'com.braintreepayments.api:braintree:#{get_current_version}'", "compile project(':BraintreeApi')")
+  replace_string(DROP_IN_BUILD_GRADLE, "compile 'com.braintreepayments.api:braintree:#{get_current_version}'", "compile project(':Braintree')")
 end
 
 desc "Interactive release to publish new version"
@@ -138,12 +138,12 @@ task :release_braintree_api, :version do |t, args|
   replace_string(BRAINTREE_API_BUILD_GRADLE, "compile project(':Core')", "compile 'com.braintreepayments.api:core:#{version}'")
   replace_string(BRAINTREE_API_BUILD_GRADLE, "compile project(':BraintreeDataCollector')", "compile 'com.braintreepayments.api:data-collector:#{version}'")
   replace_string(BRAINTREE_API_BUILD_GRADLE, "compile project(':PayPalOneTouch')", "compile 'com.paypal.android.sdk:paypal-one-touch:#{version}'")
-  sh "./gradlew clean :BraintreeApi:uploadArchives"
-  puts "BraintreeApi was uploaded, releasing..."
-  sh "./gradlew :BraintreeApi:closeRepository"
+  sh "./gradlew clean :Braintree:uploadArchives"
+  puts "Braintree was uploaded, releasing..."
+  sh "./gradlew :Braintree:closeRepository"
   puts "Sleeping for one minute to allow closing to finish"
   sleep 60
-  sh "./gradlew :BraintreeApi:promoteRepository"
+  sh "./gradlew :Braintree:promoteRepository"
   puts "Sleeping for ten minutes to allow promotion to finish"
   sleep 600
 end
@@ -152,7 +152,7 @@ task :release_drop_in, :version do |t, args|
   version = args[:version]
   abort("A version must be provided") unless version != nil
 
-  replace_string(DROP_IN_BUILD_GRADLE, "compile project(':BraintreeApi')", "compile 'com.braintreepayments.api:braintree:#{version}'")
+  replace_string(DROP_IN_BUILD_GRADLE, "compile project(':Braintree')", "compile 'com.braintreepayments.api:braintree:#{version}'")
   sh "./gradlew clean :Drop-In:uploadArchives"
   puts "Drop-In was uploaded, releasing..."
   sh "./gradlew :Drop-In:closeRepository"
@@ -174,7 +174,7 @@ task :post_release, :version do |t, args|
   replace_string(BRAINTREE_API_BUILD_GRADLE, "compile 'com.braintreepayments.api:core:#{version}'", "compile project(':Core')")
   replace_string(BRAINTREE_API_BUILD_GRADLE, "compile 'com.braintreepayments.api:data-collector:#{version}'", "compile project(':BraintreeDataCollector')")
   replace_string(BRAINTREE_API_BUILD_GRADLE, "compile 'com.paypal.android.sdk:paypal-one-touch:#{version}'", "compile project(':PayPalOneTouch')")
-  replace_string(DROP_IN_BUILD_GRADLE, "compile 'com.braintreepayments.api:braintree:#{version}'", "compile project(':BraintreeApi')")
+  replace_string(DROP_IN_BUILD_GRADLE, "compile 'com.braintreepayments.api:braintree:#{version}'", "compile project(':Braintree')")
   update_version("#{version}-SNAPSHOT")
   sh "git commit -am 'Prepare for development'"
 

diff --git a/TestUtils/src/main/java/com/braintreepayments/testutils/SharedPreferencesHelper.java b/TestUtils/src/main/java/com/braintreepayments/testutils/SharedPreferencesHelper.java
@@ -8,12 +8,12 @@
 import static android.support.test.InstrumentationRegistry.getTargetContext;
 
 /**
- * Provides managed access to shared preferences used by BraintreeApi, et al.
+ * Provides managed access to shared preferences used by Braintree, et al.
  */
 public class SharedPreferencesHelper {
 
     /**
-     * @return Shared Preferences used in BraintreeApi
+     * @return Shared Preferences used in Braintree
      */
     public static SharedPreferences getSharedPreferences() {
         return getTargetContext().getSharedPreferences("BraintreeApi", Context.MODE_PRIVATE);

diff --git a/settings.gradle b/settings.gradle
@@ -1,4 +1,4 @@
-include ':BraintreeApi'
+include ':Braintree'
 include ':PayPalDataCollector'
 include ':BraintreeDataCollector'
 include ':Drop-In'