You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ri...@apache.org on 2021/10/05 19:06:40 UTC

[geode] branch GEODE-9567-next-geode-for-redis-rename created (now 47e7dfc)

This is an automated email from the ASF dual-hosted git repository.

ringles pushed a change to branch GEODE-9567-next-geode-for-redis-rename
in repository https://gitbox.apache.org/repos/asf/geode.git.


      at 47e7dfc  Full rename

This branch includes the following new commits:

     new 47e7dfc  Full rename

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


[geode] 01/01: Full rename

Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ringles pushed a commit to branch GEODE-9567-next-geode-for-redis-rename
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 47e7dfc61d0828192b6f25774f858fcda4b0fa14
Author: Ray Ingles <ri...@vmware.com>
AuthorDate: Tue Oct 5 15:05:21 2021 -0400

    Full rename
---
 CODEOWNERS                                         |    2 +-
 .../src/test/resources/expected-pom.xml            |    2 +-
 ci/pipelines/shared/jinja.variables.yml            |    2 +-
 ci/scripts/execute_redis_tests.sh                  |   12 +-
 ci/scripts/execute_tests.sh                        |    2 +-
 .../resources/0001-configure-redis-tests.patch     | 2855 --------------------
 geode-assembly/build.gradle                        |    2 +-
 .../integrationTest/resources/assembly_content.txt |    2 +-
 .../resources/dependency_classpath.txt             |    2 +-
 .../source/subnavs/geode-subnav.erb                |   14 +-
 .../geode/distributed/ConfigurationProperties.java |   36 +-
 .../internal/AbstractDistributionConfig.java       |    2 +-
 .../cli/commands/golden-help-offline.properties    |   12 +-
 geode-docs/developing/book_intro.html.md.erb       |    4 +-
 .../geode_apis_compatible_with_redis.html.md.erb   |   30 +-
 .../getting_started/intro_to_clients.html.md.erb   |    6 +-
 .../topics/gemfire_properties.html.md.erb          |   16 +-
 .../README.md                                      |   38 +-
 .../build.gradle                                   |    0
 .../gfsh.png                                       |  Bin
 ...CommandPipeliningNativeRedisAcceptanceTest.java |    0
 .../redis/GeodeRedisServerStartupDUnitTest.java    |    4 +-
 .../apache/geode/redis/NativeRedisClusterTest.java |    0
 .../GeodeRedisServerStartUpAcceptanceTest.java     |   10 +-
 .../GlobPatternNativeRedisAcceptanceTest.java      |    0
 .../executor/UnknownNativeRedisAcceptanceTest.java |    0
 .../cluster/ClusterNativeRedisAcceptanceTest.java  |    0
 .../connection/AuthNativeRedisAcceptanceTest.java  |    0
 .../connection/EchoNativeRedisAcceptanceTest.java  |    0
 .../connection/PingNativeRedisAcceptanceTest.java  |    0
 .../SelectNativeRedisAcceptanceTest.java           |    0
 .../hash/HScanNativeRedisAcceptanceTest.java       |    0
 .../hash/HashesNativeRedisAcceptanceTest.java      |    0
 .../hash/HincrByFloatNativeRedisAccetanceTest.java |    0
 .../MemoryOverheadNativeRedisAcceptanceTest.java   |    0
 .../executor/key/DelNativeRedisAcceptanceTest.java |    0
 .../key/DumpRestoreNativeRedisAcceptanceTest.java  |    0
 .../key/ExistsNativeRedisAcceptanceTest.java       |    0
 .../key/ExpireAtNativeRedisAcceptanceTest.java     |    0
 .../key/ExpireNativeRedisAcceptanceTest.java       |    0
 .../key/KeysNativeRedisAcceptanceTest.java         |    0
 .../key/PExpireAtNativeRedisAcceptanceTest.java    |    0
 .../key/PTTLNativeRedisAcceptanceTest.java         |    0
 .../key/PersistNativeRedisAcceptanceTest.java      |    0
 .../key/PexpireNativeRedisAcceptanceTest.java      |    0
 .../key/RenameNXNativeRedisAcceptanceTest.java     |    0
 .../key/RenameNativeRedisAcceptanceTest.java       |    0
 .../key/ScanNativeRedisAcceptanceTest.java         |    0
 .../executor/key/TTLNativeRedisAcceptanceTest.java |    0
 .../key/TypeNativeRedisAcceptanceTest.java         |    0
 .../key/UnlinkNativeRedisAcceptanceTest.java       |    0
 .../LettucePubSubNativeRedisAcceptanceTest.java    |    0
 .../NativeRedisSubCommandsIntegrationTest.java     |    0
 .../pubsub/PubSubNativeRedisAcceptanceTest.java    |    0
 .../SubscriptionsNativeRedisAcceptanceTest.java    |    0
 .../server/DBSizeNativeRedisAcceptanceTest.java    |    0
 .../server/FlushAllNativeRedisAcceptanceTest.java  |    0
 .../server/FlushDBNativeRedisAcceptanceTest.java   |    0
 .../HitsMissesNativeRedisAcceptanceTest.java       |    0
 .../server/InfoNativeRedisAcceptanceTest.java      |    0
 .../server/InfoStatsNativeRedisAcceptanceTest.java |    0
 .../MemoryStatsNativeRedisAcceptanceTest.java      |    0
 .../server/ShutDownNativeRedisAcceptanceTest.java  |    0
 .../server/SlowlogNativeRedisAcceptanceTest.java   |    0
 .../server/TimeNativeRedisAcceptanceTest.java      |    0
 .../set/SDiffNativeRedisAcceptanceTest.java        |    0
 .../set/SInterNativeRedisAcceptanceTest.java       |    0
 .../set/SIsMemberNativeRedisAcceptanceTest.java    |    0
 .../set/SMoveNativeRedisAcceptanceTest.java        |    0
 .../set/SPopNativeRedisAcceptanceTest.java         |    0
 .../set/SRemNativeRedisAcceptanceTest.java         |    0
 .../set/SScanNativeRedisAcceptanceTest.java        |    0
 .../set/SUnionNativeRedisAcceptanceTest.java       |    0
 .../set/SetsNativeRedisAcceptanceTest.java         |    0
 .../sortedset/ZAddNativeRedisAcceptanceTest.java   |    0
 .../sortedset/ZCardNativeRedisAcceptanceTest.java  |    0
 .../sortedset/ZCountNativeRedisAcceptanceTest.java |    0
 .../ZIncrByNativeRedisIntegrationTest.java         |    0
 .../ZInterStoreNativeRedisAcceptanceTest.java      |    0
 .../ZLexCountNativeRedisAcceptanceTest.java        |    0
 .../ZPopMaxNativeRedisAcceptanceTest.java          |    0
 .../ZPopMinNativeRedisAcceptanceTest.java          |    0
 .../ZRangeByLexNativeRedisAcceptanceTest.java      |    0
 .../ZRangeByScoreNativeRedisAcceptanceTest.java    |    0
 .../sortedset/ZRangeNativeRedisAcceptanceTest.java |    0
 .../sortedset/ZRankNativeRedisAcceptanceTest.java  |    0
 .../sortedset/ZRemNativeRedisAcceptanceTest.java   |    0
 .../ZRemRangeByLexNativeRedisAcceptanceTest.java   |    0
 .../ZRemRangeByRankNativeRedisAcceptanceTest.java  |    0
 .../ZRemRangeByScoreNativeRedisAcceptanceTest.java |    0
 .../ZRevRangeByLexNativeRedisAcceptanceTest.java   |    0
 .../ZRevRangeByScoreNativeRedisAcceptanceTest.java |    0
 .../ZRevRangeNativeRedisAcceptanceTest.java        |    0
 .../ZRevRankNativeRedisAcceptanceTest.java         |    0
 .../sortedset/ZScanNativeRedisIntegrationTest.java |    0
 .../sortedset/ZScoreNativeRedisAcceptanceTest.java |    0
 .../ZUnionStoreNativeRedisAcceptanceTest.java      |    0
 .../AppendMemoryNativeRedisAcceptanceTest.java     |    0
 .../string/AppendNativeRedisAcceptanceTest.java    |    0
 .../string/BitCountNativeRedisAcceptanceTest.java  |    0
 .../string/BitOpNativeRedisAcceptanceTest.java     |    0
 .../string/BitPosNativeRedisAcceptanceTest.java    |    0
 .../string/DecrByNativeRedisAcceptanceTest.java    |    0
 .../string/DecrNativeRedisAcceptanceTest.java      |    0
 .../string/GetBitNativeRedisAcceptanceTest.java    |    0
 .../string/GetNativeRedisAcceptanceTest.java       |    0
 .../string/GetRangeNativeRedisAcceptanceTest.java  |    0
 .../string/GetSetNativeRedisAcceptanceTest.java    |    0
 .../IncrByFloatNativeRedisAcceptanceTest.java      |    0
 .../string/IncrByNativeRedisAcceptanceTest.java    |    0
 .../string/IncrNativeRedisAcceptanceTest.java      |    0
 .../string/MGetNativeRedisAcceptanceTest.java      |    0
 .../string/MSetNXNativeRedisAcceptanceTest.java    |    0
 .../string/MSetNativeRedisAcceptanceTest.java      |    0
 .../string/PSetEXNativeRedisAcceptanceTest.java    |    0
 .../string/SetBitNativeRedisAcceptanceTest.java    |    0
 .../string/SetExNativeRedisAcceptanceTest.java     |    0
 .../string/SetNXNativeRedisAcceptanceTest.java     |    0
 .../string/SetNativeRedisAcceptanceTest.java       |    0
 .../string/SetRangeNativeRedisAcceptanceTest.java  |    0
 .../string/StringNativeRedisAcceptanceTest.java    |    0
 .../session/NativeRedisSessionAcceptanceTest.java  |    0
 ...NativeRedisSessionExpirationAcceptanceTest.java |    0
 .../resources/testcontainers.properties            |    0
 .../java/org/apache/geode/NativeRedisTestRule.java |    0
 .../java/org/apache/geode/redis/ClusterNode.java   |    0
 .../java/org/apache/geode/redis/ClusterNodes.java  |    0
 .../geode/redis/ConcurrentLoopingThreads.java      |    0
 .../apache/geode/redis/GeodeRedisServerRule.java   |    0
 .../geode/redis/NativeRedisClusterTestRule.java    |    0
 .../apache/geode/redis/RedisIntegrationTest.java   |    0
 .../proxy/ClusterNodesResponseProcessor.java       |    0
 .../proxy/ClusterSlotsResponseProcessor.java       |    0
 .../geode/redis/internal/proxy/HostPort.java       |    0
 .../redis/internal/proxy/MovedResponseHandler.java |    0
 .../internal/proxy/NoopRedisResponseProcessor.java |    0
 .../geode/redis/internal/proxy/RedisProxy.java     |    0
 .../internal/proxy/RedisProxyInboundHandler.java   |    0
 .../internal/proxy/RedisProxyOutboundHandler.java  |    0
 .../internal/proxy/RedisResponseProcessor.java     |    0
 .../geode/redis/internal/ssl/TestSSLServer.java    |    0
 .../geode/redis/mocks/MockBinarySubscriber.java    |    0
 .../apache/geode/redis/mocks/MockSubscriber.java   |    0
 .../test/dunit/rules/RedisClusterStartupRule.java  |    0
 .../commonTest/resources/redis-cluster-compose.yml |    0
 .../geode/redis/CheckPrimaryBucketFunction.java    |    0
 .../redis/EnsurePrimaryStaysPutDUnitTest.java      |    0
 .../apache/geode/redis/OutOfMemoryDUnitTest.java   |    0
 .../org/apache/geode/redis/RedisDistDUnitTest.java |    0
 .../java/org/apache/geode/redis/SSLDUnitTest.java  |    0
 .../cluster/RedisPartitionResolverDUnitTest.java   |    0
 .../geode/redis/internal/data/DeltaDUnitTest.java  |    0
 .../data/PartitionedRegionStatsUpdateTest.java     |    0
 .../redis/internal/executor/FlushAllDUnitTest.java |    0
 .../redis/internal/executor/MovedDUnitTest.java    |    0
 .../cluster/ClusterSlotsAndNodesDUnitTest.java     |    0
 .../cluster/JedisAndLettuceClusterDUnitTest.java   |    0
 .../internal/executor/hash/HExistsDUnitTest.java   |    0
 .../internal/executor/hash/HGetDUnitTest.java      |    0
 .../internal/executor/hash/HKeysDUnitTest.java     |    0
 .../internal/executor/hash/HMgetDUnitTest.java     |    0
 .../internal/executor/hash/HMsetDUnitTest.java     |    0
 .../internal/executor/hash/HScanDunitTest.java     |    0
 .../internal/executor/hash/HSetNXDunitTest.java    |    0
 .../executor/hash/HashesAndCrashesDUnitTest.java   |    0
 .../internal/executor/hash/HdelDUnitTest.java      |    0
 .../internal/executor/hash/HlenDUnitTest.java      |    0
 .../internal/executor/hash/HsetDUnitTest.java      |    0
 .../internal/executor/hash/HstrlenDUnitTest.java   |    0
 .../internal/executor/hash/HvalsDUnitTest.java     |    0
 .../internal/executor/key/ExpireDUnitTest.java     |    0
 .../internal/executor/key/PersistDUnitTest.java    |    0
 .../internal/executor/key/RenameDUnitTest.java     |    0
 .../internal/executor/pubsub/PubSubDUnitTest.java  |    0
 .../redis/internal/executor/set/SaddDUnitTest.java |    0
 .../redis/internal/executor/set/SremDUnitTest.java |    0
 .../internal/executor/sortedset/ZAddDUnitTest.java |    0
 .../sortedset/ZAddIncrOptionDUnitTest.java         |    0
 .../internal/executor/sortedset/ZRemDUnitTest.java |    0
 .../sortedset/ZRemRangeByLexDUnitTest.java         |    0
 .../sortedset/ZRemRangeByRankDUnitTest.java        |    0
 .../sortedset/ZRemRangeByScoreDUnitTest.java       |    0
 .../internal/executor/string/MSetDUnitTest.java    |    0
 .../internal/executor/string/MSetNXDUnitTest.java  |    0
 .../internal/executor/string/StringsDUnitTest.java |    0
 .../geode/redis/session/RedisSessionDUnitTest.java |    0
 .../geode/redis/session/SessionDUnitTest.java      |    0
 .../redis/session/SessionExpirationDUnitTest.java  |    0
 .../redis/session/SessionsAndCrashesDUnitTest.java |    0
 .../RedisSpringTestApplication.java                |    0
 .../SessionController.java                         |    0
 .../config/SessionListener.java                    |    0
 .../config/WebMvcConfig.java                       |    0
 .../AnalyzeRedisSerializablesIntegrationTest.java  |    2 +-
 .../AbstractCommandPipeliningIntegrationTest.java  |    0
 .../redis/CommandPipeliningIntegrationTest.java    |    0
 .../redis/RedisCommandArgumentsTestHelper.java     |    0
 .../org/apache/geode/redis/RedisTestHelper.java    |    0
 .../geode/redis/internal/GeodeServerRunTest.java   |    0
 .../AbstractGlobPatternIntegrationTest.java        |    0
 .../executor/AbstractUnknownIntegrationTest.java   |    0
 .../executor/GlobPatternIntegrationTest.java       |    0
 .../internal/executor/UnknownIntegrationTest.java  |    0
 .../cluster/AbstractClusterIntegrationTest.java    |    0
 .../executor/cluster/ClusterIntegrationTest.java   |    0
 .../common/UnsupportedCommandsIntegrationTest.java |    0
 .../connection/AbstractAuthIntegrationTest.java    |    0
 .../connection/AbstractEchoIntegrationTest.java    |    0
 .../connection/AbstractPingIntegrationTest.java    |    0
 .../connection/AbstractSelectIntegrationTest.java  |    0
 .../executor/connection/AuthIntegrationTest.java   |    0
 .../executor/connection/EchoIntegrationTest.java   |    0
 .../executor/connection/PingIntegrationTest.java   |    0
 .../executor/connection/QuitIntegrationTest.java   |    0
 .../executor/connection/SelectIntegrationTest.java |    0
 .../hash/AbstractHScanIntegrationTest.java         |    0
 .../hash/AbstractHashesIntegrationTest.java        |    0
 .../hash/AbstractHincrByFloatIntegrationTest.java  |    0
 .../AbstractMemoryOverheadIntegrationTest.java     |    0
 .../executor/hash/HScanIntegrationTest.java        |    0
 .../executor/hash/HashesIntegrationTest.java       |    0
 .../executor/hash/HincrByFloatIntegrationTest.java |    0
 .../hash/MemoryOverheadIntegrationTest.java        |    0
 .../executor/key/AbstractDelIntegrationTest.java   |    0
 .../key/AbstractDumpRestoreIntegrationTest.java    |    0
 .../key/AbstractExistsIntegrationTest.java         |    0
 .../key/AbstractExpireAtIntegrationTest.java       |    0
 .../key/AbstractExpireIntegrationTest.java         |    0
 .../executor/key/AbstractKeysIntegrationTest.java  |    0
 .../key/AbstractPExpireAtIntegrationTest.java      |    0
 .../executor/key/AbstractPTTLIntegrationTest.java  |    0
 .../key/AbstractPersistIntegrationTest.java        |    0
 .../key/AbstractPexpireIntegrationTest.java        |    0
 .../key/AbstractRenameIntegrationTest.java         |    0
 .../key/AbstractRenameNXIntegrationTest.java       |    0
 .../executor/key/AbstractScanIntegrationTest.java  |    0
 .../executor/key/AbstractTTLIntegrationTest.java   |    0
 .../executor/key/AbstractTypeIntegrationTest.java  |    0
 .../key/AbstractUnlinkIntegrationTest.java         |    0
 .../internal/executor/key/DelIntegrationTest.java  |    0
 .../executor/key/DumpRestoreIntegrationTest.java   |    0
 .../executor/key/ExistsIntegrationTest.java        |    0
 .../executor/key/ExpireAtIntegrationTest.java      |    0
 .../executor/key/ExpireIntegrationTest.java        |    0
 .../internal/executor/key/KeysIntegrationTest.java |    0
 .../executor/key/PExpireAtIntegrationTest.java     |    0
 .../internal/executor/key/PTTLIntegrationTest.java |    0
 .../executor/key/PersistIntegrationTest.java       |    0
 .../executor/key/PexpireIntegrationTest.java       |    0
 .../executor/key/RenameIntegrationTest.java        |    0
 .../executor/key/RenameNXIntegrationTest.java      |    0
 .../internal/executor/key/ScanIntegrationTest.java |    0
 .../internal/executor/key/TTLIntegrationTest.java  |    0
 .../internal/executor/key/TypeIntegrationTest.java |    0
 .../executor/key/UnlinkIntegrationTest.java        |    0
 .../AbstractLettucePubSubIntegrationTest.java      |    0
 .../pubsub/AbstractPubSubIntegrationTest.java      |    0
 .../pubsub/AbstractSubCommandsIntegrationTest.java |    0
 .../AbstractSubscriptionsIntegrationTest.java      |    0
 .../pubsub/LettucePubSubIntegrationTest.java       |    0
 .../executor/pubsub/PubSubIntegrationTest.java     |    0
 .../pubsub/SubCommandsIntegrationTest.java         |    0
 .../pubsub/SubscriptionsIntegrationTest.java       |    0
 .../server/AbstractDBSizeIntegrationTest.java      |    0
 .../server/AbstractFlushAllIntegrationTest.java    |    0
 .../server/AbstractFlushDBIntegrationTest.java     |    0
 .../server/AbstractHitsMissesIntegrationTest.java  |    0
 .../server/AbstractInfoIntegrationTest.java        |    0
 .../AbstractRedisInfoStatsIntegrationTest.java     |    0
 .../AbstractRedisMemoryStatsIntegrationTest.java   |    0
 .../server/AbstractShutDownIntegrationTest.java    |    0
 .../server/AbstractSlowlogIntegrationTest.java     |    0
 .../server/AbstractTimeIntegrationTest.java        |    0
 .../executor/server/CommandIntegrationTest.java    |    0
 .../executor/server/DBSizeIntegrationTest.java     |    0
 .../executor/server/FlushAllIntegrationTest.java   |    0
 .../executor/server/FlushDBIntegrationTest.java    |    0
 .../executor/server/HitsMissesIntegrationTest.java |    0
 .../executor/server/InfoIntegrationTest.java       |    0
 .../executor/server/InfoStatsIntegrationTest.java  |    0
 .../executor/server/LolWutIntegrationTest.java     |    0
 .../server/MemoryStatsIntegrationTest.java         |    0
 .../executor/server/ShutdownIntegrationTest.java   |    0
 .../executor/server/SlowlogIntegrationTest.java    |    0
 .../executor/server/TimeIntegrationTest.java       |    0
 .../executor/set/AbstractSDiffIntegrationTest.java |    0
 .../set/AbstractSInterIntegrationTest.java         |    0
 .../set/AbstractSIsMemberIntegrationTest.java      |    0
 .../executor/set/AbstractSMoveIntegrationTest.java |    0
 .../executor/set/AbstractSPopIntegrationTest.java  |    0
 .../executor/set/AbstractSRemIntegrationTest.java  |    0
 .../executor/set/AbstractSScanIntegrationTest.java |    0
 .../set/AbstractSUnionIntegrationTest.java         |    0
 .../executor/set/AbstractSetsIntegrationTest.java  |    0
 .../executor/set/SDiffIntegrationTest.java         |    0
 .../executor/set/SInterIntegrationTest.java        |    0
 .../executor/set/SIsMemberIntegrationTest.java     |    0
 .../executor/set/SMoveIntegrationTest.java         |    0
 .../internal/executor/set/SPopIntegrationTest.java |    0
 .../internal/executor/set/SRemIntegrationTest.java |    0
 .../executor/set/SScanIntegrationTest.java         |    0
 .../executor/set/SUnionIntegrationTest.java        |    0
 .../internal/executor/set/SetsIntegrationTest.java |    0
 .../sortedset/AbstractZAddIntegrationTest.java     |    0
 .../sortedset/AbstractZCardIntegrationTest.java    |    0
 .../sortedset/AbstractZCountIntegrationTest.java   |    0
 .../sortedset/AbstractZIncrByIntegrationTest.java  |    0
 .../AbstractZInterStoreIntegrationTest.java        |    0
 .../AbstractZLexCountIntegrationTest.java          |    0
 .../sortedset/AbstractZPopMaxIntegrationTest.java  |    0
 .../sortedset/AbstractZPopMinIntegrationTest.java  |    0
 .../AbstractZRangeByLexIntegrationTest.java        |    0
 .../AbstractZRangeByScoreIntegrationTest.java      |    0
 .../sortedset/AbstractZRangeIntegrationTest.java   |    0
 .../sortedset/AbstractZRankIntegrationTest.java    |    0
 .../sortedset/AbstractZRemIntegrationTest.java     |    0
 .../AbstractZRemRangeByLexIntegrationTest.java     |    0
 .../AbstractZRemRangeByRankIntegrationTest.java    |    0
 .../AbstractZRemRangeByScoreIntegrationTest.java   |    0
 .../AbstractZRevRangeByLexIntegrationTest.java     |    0
 .../AbstractZRevRangeByScoreIntegrationTest.java   |    0
 .../AbstractZRevRangeIntegrationTest.java          |    0
 .../sortedset/AbstractZRevRankIntegrationTest.java |    0
 .../sortedset/AbstractZScanIntegrationTest.java    |    0
 .../sortedset/AbstractZScoreIntegrationTest.java   |    0
 .../AbstractZUnionStoreIntegrationTest.java        |    0
 .../executor/sortedset/ZAddIntegrationTest.java    |    0
 .../executor/sortedset/ZCardIntegrationTest.java   |    0
 .../executor/sortedset/ZCountIntegrationTest.java  |    0
 .../executor/sortedset/ZIncrByIntegrationTest.java |    0
 .../sortedset/ZInterStoreIntegrationTest.java      |    0
 .../sortedset/ZLexCountIntegrationTest.java        |    0
 .../executor/sortedset/ZPopMaxIntegrationTest.java |    0
 .../executor/sortedset/ZPopMinIntegrationTest.java |    0
 .../sortedset/ZRangeByLexIntegrationTest.java      |    0
 .../sortedset/ZRangeByScoreIntegrationTest.java    |    0
 .../executor/sortedset/ZRangeIntegrationTest.java  |    0
 .../executor/sortedset/ZRankIntegrationTest.java   |    0
 .../executor/sortedset/ZRemIntegrationTest.java    |    0
 .../sortedset/ZRemRangeByLexIntegrationTest.java   |    0
 .../sortedset/ZRemRangeByRankIntegrationTest.java  |    0
 .../sortedset/ZRemRangeByScoreIntegrationTest.java |    0
 .../sortedset/ZRevRangeByLexIntegrationTest.java   |    0
 .../sortedset/ZRevRangeByScoreIntegrationTest.java |    0
 .../sortedset/ZRevRangeIntegrationTest.java        |    0
 .../sortedset/ZRevRankIntegrationTest.java         |    0
 .../executor/sortedset/ZScanIntegrationTest.java   |    0
 .../executor/sortedset/ZScoreIntegrationTest.java  |    0
 .../sortedset/ZUnionStoreIntegrationTest.java      |    0
 .../string/AbstractAppendIntegrationTest.java      |    0
 .../AbstractAppendMemoryIntegrationTest.java       |    0
 .../string/AbstractBitCountIntegrationTest.java    |    0
 .../string/AbstractBitOpIntegrationTest.java       |    0
 .../string/AbstractBitPosIntegrationTest.java      |    0
 .../string/AbstractDecrByIntegrationTest.java      |    0
 .../string/AbstractDecrIntegrationTest.java        |    0
 .../string/AbstractGetBitIntegrationTest.java      |    0
 .../string/AbstractGetIntegrationTest.java         |    0
 .../string/AbstractGetRangeIntegrationTest.java    |    0
 .../string/AbstractGetSetIntegrationTest.java      |    0
 .../string/AbstractIncrByFloatIntegrationTest.java |    0
 .../string/AbstractIncrByIntegrationTest.java      |    0
 .../string/AbstractIncrIntegrationTest.java        |    0
 .../AbstractLettuceAppendIntegrationTest.java      |    0
 .../string/AbstractMGetIntegrationTest.java        |    0
 .../string/AbstractMSetIntegrationTest.java        |    0
 .../string/AbstractMSetNXIntegrationTest.java      |    0
 .../string/AbstractPSetEXIntegrationTest.java      |    0
 .../string/AbstractSetBitIntegrationTest.java      |    0
 .../string/AbstractSetEXIntegrationTest.java       |    0
 .../string/AbstractSetIntegrationTest.java         |    0
 .../string/AbstractSetNXIntegrationTest.java       |    0
 .../string/AbstractSetRangeIntegrationTest.java    |    0
 .../string/AbstractStringIntegrationTest.java      |    0
 .../executor/string/AppendIntegrationTest.java     |    0
 .../string/AppendMemoryIntegrationTest.java        |    0
 .../executor/string/BitCountIntegrationTest.java   |    0
 .../executor/string/BitOpIntegrationTest.java      |    0
 .../executor/string/BitPosIntegrationTest.java     |    0
 .../executor/string/DecrByIntegrationTest.java     |    0
 .../executor/string/DecrIntegrationTest.java       |    0
 .../executor/string/GetBitIntegrationTest.java     |    0
 .../executor/string/GetIntegrationTest.java        |    0
 .../executor/string/GetRangeIntegrationTest.java   |    0
 .../executor/string/GetSetIntegrationTest.java     |    0
 .../string/IncrByFloatIntegrationTest.java         |    0
 .../executor/string/IncrByIntegrationTest.java     |    0
 .../executor/string/IncrIntegrationTest.java       |    0
 .../string/LettuceAppendIntegrationTest.java       |    0
 .../executor/string/MGetIntegrationTest.java       |    0
 .../executor/string/MSetIntegrationTest.java       |    0
 .../executor/string/MSetNXIntegrationTest.java     |    0
 .../executor/string/PSetEXIntegrationTest.java     |    0
 .../executor/string/SetBitIntegrationTest.java     |    0
 .../executor/string/SetEXIntegrationTest.java      |    0
 .../executor/string/SetIntegrationTest.java        |    0
 .../executor/string/SetNXIntegrationTest.java      |    0
 .../executor/string/SetRangeIntegrationTest.java   |    0
 .../executor/string/StringIntegrationTest.java     |    0
 .../pubsub/SubscriptionsIntegrationTest.java       |    0
 .../LockingStripedCoordinatorIntegrationTest.java  |    0
 .../apache/geode/codeAnalysis/excludedClasses.txt  |    0
 .../codeAnalysis/sanctionedDataSerializables.txt   |    0
 .../collections/OrderedStatisticTreeBenchmark.java |    0
 .../collections/RedisHashMapBenchmark.java         |    0
 .../geode/redis/internal/GeodeRedisServer.java     |    0
 .../geode/redis/internal/GeodeRedisService.java    |    0
 .../redis/internal/PassiveExpirationManager.java   |    0
 .../redis/internal/RedisCommandSupportLevel.java   |    0
 .../geode/redis/internal/RedisCommandType.java     |    0
 .../geode/redis/internal/RedisConstants.java       |    0
 .../geode/redis/internal/RedisException.java       |    0
 .../RedisSanctionedSerializablesService.java       |    2 +-
 .../geode/redis/internal/RegionProvider.java       |    0
 .../apache/geode/redis/internal/SlotAdvisor.java   |    0
 .../redis/internal/cluster/RedisMemberInfo.java    |    0
 .../cluster/RedisMemberInfoRetrievalFunction.java  |    0
 .../collections/Bytes2ObjectOpenHashMap.java       |    0
 .../internal/collections/IndexibleTreeSet.java     |    0
 .../internal/collections/OrderStatisticsSet.java   |    0
 .../internal/collections/OrderStatisticsTree.java  |    0
 ...bleBytes2ObjectOpenCustomHashMapWithCursor.java |    0
 .../SizeableObjectOpenCustomHashSet.java           |    0
 .../redis/internal/collections/package-info.java   |    0
 .../redis/internal/data/AbstractRedisData.java     |    0
 .../geode/redis/internal/data/KeyHashUtil.java     |    0
 .../geode/redis/internal/data/NullRedisData.java   |    0
 .../internal/data/NullRedisDataStructures.java     |    0
 .../geode/redis/internal/data/NullRedisHash.java   |    0
 .../geode/redis/internal/data/NullRedisSet.java    |    0
 .../redis/internal/data/NullRedisSortedSet.java    |    0
 .../geode/redis/internal/data/NullRedisString.java |    0
 .../geode/redis/internal/data/RedisData.java       |    0
 .../data/RedisDataCommandsFunctionExecutor.java    |    0
 .../internal/data/RedisDataMovedException.java     |    0
 .../geode/redis/internal/data/RedisDataType.java   |    0
 .../data/RedisDataTypeMismatchException.java       |    0
 .../geode/redis/internal/data/RedisHash.java       |    0
 .../data/RedisHashCommandsFunctionExecutor.java    |    0
 .../apache/geode/redis/internal/data/RedisKey.java |    0
 .../data/RedisKeyCommandsFunctionExecutor.java     |    0
 .../internal/data/RedisKeyExistsException.java     |    0
 .../apache/geode/redis/internal/data/RedisSet.java |    0
 .../data/RedisSetCommandsFunctionExecutor.java     |    0
 .../geode/redis/internal/data/RedisSortedSet.java  |    0
 .../RedisSortedSetCommandsFunctionExecutor.java    |    0
 .../geode/redis/internal/data/RedisString.java     |    0
 .../data/RedisStringCommandsFunctionExecutor.java  |    0
 .../geode/redis/internal/delta/AddsDeltaInfo.java  |    0
 .../redis/internal/delta/AppendDeltaInfo.java      |    0
 .../geode/redis/internal/delta/DeltaInfo.java      |    0
 .../geode/redis/internal/delta/DeltaType.java      |    0
 .../geode/redis/internal/delta/RemsDeltaInfo.java  |    0
 .../redis/internal/delta/TimestampDeltaInfo.java   |    0
 .../geode/redis/internal/delta/ZAddsDeltaInfo.java |    0
 .../redis/internal/executor/AbstractExecutor.java  |    0
 .../redis/internal/executor/BaseSetOptions.java    |    0
 .../geode/redis/internal/executor/Executor.java    |    0
 .../geode/redis/internal/executor/GlobPattern.java |    0
 .../redis/internal/executor/RedisResponse.java     |    0
 .../internal/executor/SingleResultCollector.java   |    0
 .../redis/internal/executor/UnknownExecutor.java   |    0
 .../redis/internal/executor/cluster/CRC16.java     |    0
 .../internal/executor/cluster/ClusterExecutor.java |    0
 .../executor/cluster/RedisPartitionResolver.java   |    0
 .../internal/executor/connection/AuthExecutor.java |    0
 .../internal/executor/connection/EchoExecutor.java |    0
 .../internal/executor/connection/PingExecutor.java |    0
 .../internal/executor/connection/QuitExecutor.java |    0
 .../executor/connection/SelectExecutor.java        |    0
 .../redis/internal/executor/hash/HDelExecutor.java |    0
 .../internal/executor/hash/HExistsExecutor.java    |    0
 .../internal/executor/hash/HGetAllExecutor.java    |    0
 .../redis/internal/executor/hash/HGetExecutor.java |    0
 .../internal/executor/hash/HIncrByExecutor.java    |    0
 .../executor/hash/HIncrByFloatExecutor.java        |    0
 .../internal/executor/hash/HKeysExecutor.java      |    0
 .../redis/internal/executor/hash/HLenExecutor.java |    0
 .../internal/executor/hash/HMGetExecutor.java      |    0
 .../internal/executor/hash/HMSetExecutor.java      |    0
 .../internal/executor/hash/HScanExecutor.java      |    0
 .../redis/internal/executor/hash/HSetExecutor.java |    0
 .../internal/executor/hash/HSetNXExecutor.java     |    0
 .../internal/executor/hash/HStrLenExecutor.java    |    0
 .../internal/executor/hash/HValsExecutor.java      |    0
 .../internal/executor/hash/RedisHashCommands.java  |    0
 .../executor/key/AbstractRenameExecutor.java       |    0
 .../executor/key/AbstractScanExecutor.java         |    0
 .../redis/internal/executor/key/DelExecutor.java   |    0
 .../redis/internal/executor/key/DumpExecutor.java  |    0
 .../internal/executor/key/ExistsExecutor.java      |    0
 .../internal/executor/key/ExpireAtExecutor.java    |    0
 .../internal/executor/key/ExpireExecutor.java      |    0
 .../redis/internal/executor/key/KeysExecutor.java  |    0
 .../internal/executor/key/PExpireAtExecutor.java   |    0
 .../internal/executor/key/PExpireExecutor.java     |    0
 .../redis/internal/executor/key/PTTLExecutor.java  |    0
 .../internal/executor/key/PersistExecutor.java     |    0
 .../internal/executor/key/RedisKeyCommands.java    |    0
 .../internal/executor/key/RenameExecutor.java      |    0
 .../internal/executor/key/RenameNXExecutor.java    |    0
 .../internal/executor/key/RestoreExecutor.java     |    0
 .../internal/executor/key/RestoreOptions.java      |    0
 .../redis/internal/executor/key/ScanExecutor.java  |    0
 .../redis/internal/executor/key/TTLExecutor.java   |    0
 .../redis/internal/executor/key/TypeExecutor.java  |    0
 .../executor/pubsub/PsubscribeExecutor.java        |    0
 .../internal/executor/pubsub/PubSubExecutor.java   |    0
 .../internal/executor/pubsub/PublishExecutor.java  |    0
 .../executor/pubsub/PunsubscribeExecutor.java      |    0
 .../executor/pubsub/SubscribeExecutor.java         |    0
 .../executor/pubsub/UnsubscribeExecutor.java       |    0
 .../internal/executor/server/CommandExecutor.java  |    0
 .../internal/executor/server/DBSizeExecutor.java   |    0
 .../internal/executor/server/FlushAllExecutor.java |    0
 .../internal/executor/server/InfoExecutor.java     |    0
 .../internal/executor/server/LolWutExecutor.java   |    0
 .../internal/executor/server/ShutDownExecutor.java |    0
 .../internal/executor/server/SlowlogExecutor.java  |    0
 .../internal/executor/server/TimeExecutor.java     |    0
 .../internal/executor/set/RedisSetCommands.java    |    0
 .../redis/internal/executor/set/SAddExecutor.java  |    0
 .../redis/internal/executor/set/SCardExecutor.java |    0
 .../redis/internal/executor/set/SDiffExecutor.java |    0
 .../internal/executor/set/SDiffStoreExecutor.java  |    0
 .../internal/executor/set/SInterExecutor.java      |    0
 .../internal/executor/set/SInterStoreExecutor.java |    0
 .../internal/executor/set/SIsMemberExecutor.java   |    0
 .../internal/executor/set/SMembersExecutor.java    |    0
 .../redis/internal/executor/set/SMoveExecutor.java |    0
 .../redis/internal/executor/set/SPopExecutor.java  |    0
 .../internal/executor/set/SRandMemberExecutor.java |    0
 .../redis/internal/executor/set/SRemExecutor.java  |    0
 .../redis/internal/executor/set/SScanExecutor.java |    0
 .../internal/executor/set/SUnionExecutor.java      |    0
 .../internal/executor/set/SUnionStoreExecutor.java |    0
 .../redis/internal/executor/set/SetOpExecutor.java |    0
 .../sortedset/AbstractSortedSetRangeExecutor.java  |    0
 .../sortedset/AbstractSortedSetRangeOptions.java   |    0
 .../executor/sortedset/AbstractZPopExecutor.java   |    0
 .../executor/sortedset/AbstractZRankExecutor.java  |    0
 .../executor/sortedset/RedisSortedSetCommands.java |    0
 .../sortedset/SortedSetLexRangeOptions.java        |    0
 .../sortedset/SortedSetRankRangeOptions.java       |    0
 .../sortedset/SortedSetScoreRangeOptions.java      |    0
 .../internal/executor/sortedset/ZAddExecutor.java  |    0
 .../internal/executor/sortedset/ZAddOptions.java   |    0
 .../internal/executor/sortedset/ZAggregator.java   |    0
 .../internal/executor/sortedset/ZCardExecutor.java |    0
 .../executor/sortedset/ZCountExecutor.java         |    0
 .../executor/sortedset/ZIncrByExecutor.java        |    0
 .../executor/sortedset/ZInterStoreExecutor.java    |    0
 .../internal/executor/sortedset/ZKeyWeight.java    |    0
 .../executor/sortedset/ZLexCountExecutor.java      |    0
 .../executor/sortedset/ZPopMaxExecutor.java        |    0
 .../executor/sortedset/ZPopMinExecutor.java        |    0
 .../executor/sortedset/ZRangeByLexExecutor.java    |    0
 .../executor/sortedset/ZRangeByScoreExecutor.java  |    0
 .../executor/sortedset/ZRangeExecutor.java         |    0
 .../internal/executor/sortedset/ZRankExecutor.java |    0
 .../internal/executor/sortedset/ZRemExecutor.java  |    0
 .../executor/sortedset/ZRemRangeByLexExecutor.java |    0
 .../sortedset/ZRemRangeByRankExecutor.java         |    0
 .../sortedset/ZRemRangeByScoreExecutor.java        |    0
 .../executor/sortedset/ZRevRangeByLexExecutor.java |    0
 .../sortedset/ZRevRangeByScoreExecutor.java        |    0
 .../executor/sortedset/ZRevRangeExecutor.java      |    0
 .../executor/sortedset/ZRevRankExecutor.java       |    0
 .../internal/executor/sortedset/ZScanExecutor.java |    0
 .../executor/sortedset/ZScoreExecutor.java         |    0
 .../executor/sortedset/ZStoreExecutor.java         |    0
 .../executor/sortedset/ZUnionStoreExecutor.java    |    0
 .../executor/string/AbstractMSetExecutor.java      |    0
 .../internal/executor/string/AppendExecutor.java   |    0
 .../internal/executor/string/BitCountExecutor.java |    0
 .../internal/executor/string/BitOpExecutor.java    |    0
 .../internal/executor/string/BitPosExecutor.java   |    0
 .../internal/executor/string/DecrByExecutor.java   |    0
 .../internal/executor/string/DecrExecutor.java     |    0
 .../internal/executor/string/GetBitExecutor.java   |    0
 .../internal/executor/string/GetExecutor.java      |    0
 .../internal/executor/string/GetRangeExecutor.java |    0
 .../internal/executor/string/GetSetExecutor.java   |    0
 .../internal/executor/string/IncrByExecutor.java   |    0
 .../executor/string/IncrByFloatExecutor.java       |    0
 .../internal/executor/string/IncrExecutor.java     |    0
 .../internal/executor/string/MGetExecutor.java     |    0
 .../internal/executor/string/MSetExecutor.java     |    0
 .../internal/executor/string/MSetNXExecutor.java   |    0
 .../internal/executor/string/PSetEXExecutor.java   |    0
 .../executor/string/RedisStringCommands.java       |    0
 .../internal/executor/string/SetBitExecutor.java   |    0
 .../internal/executor/string/SetEXExecutor.java    |    0
 .../internal/executor/string/SetExecutor.java      |    0
 .../internal/executor/string/SetNXExecutor.java    |    0
 .../redis/internal/executor/string/SetOptions.java |    0
 .../internal/executor/string/SetRangeExecutor.java |    0
 .../internal/executor/string/StrlenExecutor.java   |    0
 .../redis/internal/netty/ByteToCommandDecoder.java |    0
 .../apache/geode/redis/internal/netty/Client.java  |    0
 .../apache/geode/redis/internal/netty/Coder.java   |    0
 .../geode/redis/internal/netty/CoderException.java |    0
 .../apache/geode/redis/internal/netty/Command.java |    0
 .../internal/netty/ExecutionHandlerContext.java    |    0
 .../redis/internal/netty/NettyRedisServer.java     |    2 +-
 .../netty/RedisCommandParserException.java         |    0
 .../redis/internal/netty/StringBytesGlossary.java  |    0
 .../parameters/ClusterParameterRequirements.java   |    0
 .../geode/redis/internal/parameters/Parameter.java |    0
 .../RedisParametersMismatchException.java          |    0
 .../parameters/SlowlogParameterRequirements.java   |    0
 .../pubsub/AbstractSubscriptionManager.java        |    0
 .../pubsub/ChannelClientSubscriptionManager.java   |    0
 .../pubsub/ChannelSubscriptionManager.java         |    0
 .../internal/pubsub/ClientSubscriptionManager.java |    0
 .../pubsub/PatternClientSubscriptionManager.java   |    0
 .../pubsub/PatternSubscriptionManager.java         |    0
 .../apache/geode/redis/internal/pubsub/PubSub.java |    0
 .../geode/redis/internal/pubsub/PubSubImpl.java    |    0
 .../redis/internal/pubsub/SubscribeResult.java     |    0
 .../geode/redis/internal/pubsub/Subscription.java  |    0
 .../redis/internal/pubsub/SubscriptionImpl.java    |    0
 .../redis/internal/pubsub/SubscriptionManager.java |    0
 .../geode/redis/internal/pubsub/Subscriptions.java |    0
 .../services/LockingStripedCoordinator.java        |    0
 .../redis/internal/services/StripedCallable.java   |    0
 .../internal/services/StripedCoordinator.java      |    0
 .../internal/services/StripedExecutorService.java  |    0
 .../redis/internal/services/StripedObject.java     |    0
 .../redis/internal/services/StripedRunnable.java   |    0
 .../redis/internal/statistics/GeodeRedisStats.java |    2 +-
 .../redis/internal/statistics/RedisStats.java      |    0
 .../org.apache.geode.internal.cache.CacheService   |    0
 ...al.serialization.SanctionedSerializablesService |    0
 ...de-apis-compatible-with-redis-serializables.txt |    0
 .../src/performanceTest/benchmark.sh               |    0
 .../src/performanceTest/environment-setup.sh       |    6 +-
 .../src/performanceTest/execute-operation.sh       |    0
 .../src/performanceTest/shacompare.sh              |    0
 .../src/performanceTest/summarize-batch-results.sh |    0
 .../performanceTest/summarize-operation-results.sh |    0
 .../redis/internal/RegionProviderJUnitTest.java    |    0
 .../collections/OrderStatisticsTreeTest.java       |    0
 .../OrderedStatisticTreeQuickCheckTest.java        |    0
 ...tOpenCustomHashMapWithCursorQuickCheckTest.java |    0
 ...ytes2ObjectOpenCustomHashMapWithCursorTest.java |    0
 .../SizeableObjectOpenCustomHashSetTest.java       |    0
 .../geode/redis/internal/data/KeyHashUtilTest.java |    0
 .../geode/redis/internal/data/RedisHashTest.java   |    0
 .../redis/internal/data/RedisKeyJUnitTest.java     |    0
 .../geode/redis/internal/data/RedisSetTest.java    |    0
 .../redis/internal/data/RedisSortedSetTest.java    |    0
 .../internal/data/RedisStringQuickCheckTest.java   |    0
 .../geode/redis/internal/data/RedisStringTest.java |    0
 .../redis/internal/executor/GlobPatternTest.java   |    0
 .../internal/executor/cluster/CRC16JUnitTest.java  |    0
 .../executor/sortedset/ZScanExecutorTest.java      |    0
 .../geode/redis/internal/netty/ClientTest.java     |    0
 .../geode/redis/internal/netty/CoderTest.java      |    0
 .../redis/internal/netty/CommandJUnitTest.java     |    0
 .../ChannelClientSubscriptionManagerTest.java      |    0
 .../pubsub/ChannelSubscriptionManagerTest.java     |    0
 .../PatternClientSubscriptionManagerTest.java      |    0
 .../pubsub/PatternSubscriptionManagerTest.java     |    0
 .../redis/internal/pubsub/PubSubImplTest.java      |    0
 .../internal/pubsub/SubscriptionImplTest.java      |    0
 .../pubsub/SubscriptionManagerTestBase.java        |    0
 .../internal/pubsub/SubscriptionsJUnitTest.java    |    0
 .../services/LockingStripedCoordinatorTest.java    |    0
 .../services/StripedExecutorServiceJUnitTest.java  |    0
 .../src/test/resources/expected-pom.xml            |    2 +-
 .../internal/cli/commands/StartServerCommand.java  |    4 +-
 .../internal/cli/util/HyphenFormatterTest.java     |    8 +-
 settings.gradle                                    |    2 +-
 674 files changed, 114 insertions(+), 2969 deletions(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index c1de901..20a3fec 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -284,7 +284,7 @@ geode-assembly/**/resources/**                                    @boglesby @kir
 #-----------------------------------------------------------------
 # Redis API
 #-----------------------------------------------------------------
-geode-apis-compatible-with-redis/**                               @jdeppe-pivotal @nonbinaryprogrammer @ringles @upthewaterspout @DonalEvans @dschneider-pivotal @kirklund
+geode-for-redis/**                                                @jdeppe-pivotal @nonbinaryprogrammer @ringles @upthewaterspout @DonalEvans @dschneider-pivotal @kirklund
 
 #-----------------------------------------------------------------
 # Build and tooling
diff --git a/boms/geode-all-bom/src/test/resources/expected-pom.xml b/boms/geode-all-bom/src/test/resources/expected-pom.xml
index c3cbb87..a5cbbde 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -754,7 +754,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.geode</groupId>
-        <artifactId>geode-apis-compatible-with-redis</artifactId>
+        <artifactId>geode-for-redis</artifactId>
         <version>${version}</version>
         <scope>compile</scope>
       </dependency>
diff --git a/ci/pipelines/shared/jinja.variables.yml b/ci/pipelines/shared/jinja.variables.yml
index 81d896e..360a917 100644
--- a/ci/pipelines/shared/jinja.variables.yml
+++ b/ci/pipelines/shared/jinja.variables.yml
@@ -166,7 +166,7 @@ tests:
   DISK: '200GB'
   DUNIT_PARALLEL_FORKS: '0'
   EXECUTE_TEST_TIMEOUT: 30m
-  GRADLE_TASK: ':geode-apis-compatible-with-redis:redisAPITest'
+  GRADLE_TASK: ':geode-for-redis:redisAPITest'
   MAX_IN_FLIGHT: 1
   ONLY_JDK: 11
   PARALLEL_DUNIT: 'false'
diff --git a/ci/scripts/execute_redis_tests.sh b/ci/scripts/execute_redis_tests.sh
index d717397..44563b5 100755
--- a/ci/scripts/execute_redis_tests.sh
+++ b/ci/scripts/execute_redis_tests.sh
@@ -23,7 +23,7 @@ cd ..
 # Redis commands.  Once all commands needed to run relevant test files are implemented, we hope to
 # use Redis's repo without a patch.
 git clone --config transfer.fsckObjects=false https://github.com/redis/redis.git
-REDIS_PATCH=${PWD}/geode-apis-compatible-with-redis/src/acceptanceTest/resources/0001-configure-redis-tests.patch
+REDIS_PATCH=${PWD}/geode-for-redis/src/acceptanceTest/resources/0001-configure-redis-tests.patch
 cd redis
 git checkout origin/5.0
 git apply ${REDIS_PATCH}
@@ -33,9 +33,9 @@ export JAVA_HOME=${JAVA_TEST_PATH}
 ../geode-assembly/build/install/apache-geode/bin/gfsh start server \
   --J=-Denable-unsupported-commands=true \
   --name=server1 \
-  --compatible-with-redis-port=6380 \
-  --compatible-with-redis-bind-address=127.0.0.1 \
-  --compatible-with-redis-username=foobar \
+  --geode-for-redis-port=6380 \
+  --geode-for-redis-bind-address=127.0.0.1 \
+  --geode-for-redis-username=foobar \
   --server-port=0 \
   --J=-Dgemfire.security-manager=org.apache.geode.examples.SimpleSecurityManager \
   --J=-Dgemfire.jmx-manager=true \
@@ -58,8 +58,8 @@ failCount=0
   --J=-Denable-unsupported-commands=true \
   --name=server2 \
   --server-port=0 \
-  --compatible-with-redis-port=6379 \
-  --compatible-with-redis-bind-address=127.0.0.1 \
+  --geode-for-redis-port=6379 \
+  --geode-for-redis-bind-address=127.0.0.1 \
   --J=-Dgemfire.jmx-manager=true \
   --J=-Dgemfire.jmx-manager-start=true \
   --J=-Dgemfire.jmx-manager-port=1099
diff --git a/ci/scripts/execute_tests.sh b/ci/scripts/execute_tests.sh
index c4d325c..0ef2b26 100755
--- a/ci/scripts/execute_tests.sh
+++ b/ci/scripts/execute_tests.sh
@@ -37,7 +37,7 @@ fi
 . ${SCRIPTDIR}/shared_utilities.sh
 is_source_from_pr_testable "geode" "$(get_geode_pr_exclusion_dirs)" || exit 0
 
-if [ "${GRADLE_TASK}" = ":geode-apis-compatible-with-redis:redisAPITest" ] && ! grep -q redisAPITest geode/geode-apis-compatible-with-redis/build.gradle ; then
+if [ "${GRADLE_TASK}" = ":geode-for-redis:redisAPITest" ] && ! grep -q redisAPITest geode/geode-for-redis/build.gradle ; then
   echo "redisAPITest is not applicable for 1.13 and earlier"
   exit 0
 fi
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/resources/0001-configure-redis-tests.patch b/geode-apis-compatible-with-redis/src/acceptanceTest/resources/0001-configure-redis-tests.patch
deleted file mode 100644
index 5a5ff36..0000000
--- a/geode-apis-compatible-with-redis/src/acceptanceTest/resources/0001-configure-redis-tests.patch
+++ /dev/null
@@ -1,2855 +0,0 @@
-diff --git a/tests/support/server.tcl b/tests/support/server.tcl
-index 5578f1fd6..55c0a5253 100644
---- a/tests/support/server.tcl
-+++ b/tests/support/server.tcl
-@@ -143,11 +143,12 @@ proc start_server {options {code undefined}} {
-     if {$::external} {
-         if {[llength $::servers] == 0} {
-             set srv {}
-+            set baseport [expr {$::port-100}]
-             dict set srv "host" $::host
--            dict set srv "port" $::port
--            set client [redis $::host $::port]
-+            dict set srv "port" $baseport
-+            set client [redis $::host $baseport]
-             dict set srv "client" $client
--            $client select 9
-+           # $client select 9
- 
-             # append the server to the stack
-             lappend ::servers $srv
-diff --git a/tests/support/test.tcl b/tests/support/test.tcl
-index 6f02f2f12..5a31cb4ca 100644
---- a/tests/support/test.tcl
-+++ b/tests/support/test.tcl
-@@ -39,8 +39,8 @@ proc assert_error {pattern code} {
- }
- 
- proc assert_encoding {enc key} {
--    set dbg [r debug object $key]
--    assert_match "* encoding:$enc *" $dbg
-+#    set dbg [r debug object $key]
-+#    assert_match "* encoding:$enc *" $dbg
- }
- 
- proc assert_type {type key} {
-diff --git a/tests/test_helper.tcl b/tests/test_helper.tcl
-index 8978631e0..33c10eb15 100644
---- a/tests/test_helper.tcl
-+++ b/tests/test_helper.tcl
-@@ -144,14 +144,14 @@ proc reconnect {args} {
-     set srv [lindex $::servers end+$level]
-     set host [dict get $srv "host"]
-     set port [dict get $srv "port"]
--    set config [dict get $srv "config"]
-+# set config [dict get $srv "config"]
-     set client [redis $host $port]
-     dict set srv "client" $client
- 
-     # select the right db when we don't have to authenticate
--    if {![dict exists $config "requirepass"]} {
--        $client select 9
--    }
-+#    if {![dict exists $config "requirepass"]} {
-+#        $client select 9
-+#    }
- 
-     # re-set $srv in the servers list
-     lset ::servers end+$level $srv
-@@ -168,7 +168,7 @@ proc redis_deferring_client {args} {
-     set client [redis [srv $level "host"] [srv $level "port"] 1]
- 
-     # select the right db and read the response (OK)
--    $client select 9
-+    $client select 0
-     $client read
-     return $client
- }
-@@ -488,6 +488,7 @@ for {set j 0} {$j < [llength $argv]} {incr j} {
-     } elseif {$opt eq {--host}} {
-         set ::external 1
-         set ::host $arg
-+        set ::numclients 1
-         incr j
-     } elseif {$opt eq {--port}} {
-         set ::port $arg
-diff --git a/tests/unit/auth.tcl b/tests/unit/auth.tcl
-index f5da728e8..6ae96f295 100644
---- a/tests/unit/auth.tcl
-+++ b/tests/unit/auth.tcl
-@@ -1,15 +1,16 @@
--start_server {tags {"auth"}} {
--    test {AUTH fails if there is no password configured server side} {
--        catch {r auth foo} err
--        set _ $err
--    } {ERR*no password*}
--}
-+#we don't currently integrate with Redis's tag system to remove our server's password
-+#start_server {tags {"auth"}} {
-+#    test {AUTH fails if there is no password configured server side} {
-+#        catch {r auth foo} err
-+#        set _ $err
-+#    } {ERR*no password*}
-+#}
- 
- start_server {tags {"auth"} overrides {requirepass foobar}} {
-     test {AUTH fails when a wrong password is given} {
-         catch {r auth wrong!} err
-         set _ $err
--    } {ERR*invalid password}
-+    } {WRONGPASS invalid username-password pair or user is disabled.}
- 
-     test {Arbitrary command gives an error when AUTH is required} {
-         catch {r set foo bar} err
-@@ -17,7 +18,7 @@ start_server {tags {"auth"} overrides {requirepass foobar}} {
-     } {NOAUTH*}
- 
-     test {AUTH succeeds when the right password is given} {
--        r auth foobar
-+        r auth dataWrite dataWrite
-     } {OK}
- 
-     test {Once AUTH succeeded we can actually send commands to the server} {
-@@ -25,19 +26,19 @@ start_server {tags {"auth"} overrides {requirepass foobar}} {
-         r incr foo
-     } {101}
- 
--    test {For unauthenticated clients multibulk and bulk length are limited} {
--        set rr [redis [srv "host"] [srv "port"] 0]
--        $rr write "*100\r\n"
--        $rr flush
--        catch {[$rr read]} e
--        assert_match {*unauthenticated multibulk length*} $e
--        $rr close
--
--        set rr [redis [srv "host"] [srv "port"] 0]
--        $rr write "*1\r\n\$100000000\r\n"
--        $rr flush
--        catch {[$rr read]} e
--        assert_match {*unauthenticated bulk length*} $e
--        $rr close
--    }
-+#    test {For unauthenticated clients multibulk and bulk length are limited} {
-+#        set rr [redis [srv "host"] [srv "port"] 0]
-+#        $rr write "*100\r\n"
-+#        $rr flush
-+#        catch {[$rr read]} e
-+#        assert_match {*unauthenticated multibulk length*} $e
-+#        $rr close
-+#
-+#        set rr [redis [srv "host"] [srv "port"] 0]
-+#        $rr write "*1\r\n\$100000000\r\n"
-+#        $rr flush
-+#        catch {[$rr read]} e
-+#        assert_match {*unauthenticated bulk length*} $e
-+#        $rr close
-+#    }
- }
-diff --git a/tests/unit/dump.tcl b/tests/unit/dump.tcl
-index 4c4e5d075..18bb694f2 100644
---- a/tests/unit/dump.tcl
-+++ b/tests/unit/dump.tcl
-@@ -41,34 +41,35 @@ start_server {tags {"dump"}} {
-         r set foo bar
-         set encoded [r dump foo]
-         set now [clock milliseconds]
--        r debug set-active-expire 0
-+#        r debug set-active-expire 0
-         r restore foo [expr $now-3000] $encoded absttl REPLACE
--        catch {r debug object foo} e
--        r debug set-active-expire 1
--        set e
--    } {ERR no such key}
--
--    test {RESTORE can set LRU} {
--        r set foo bar
--        set encoded [r dump foo]
--        r del foo
--        r config set maxmemory-policy allkeys-lru
--        r restore foo 0 $encoded idletime 1000
--        set idle [r object idletime foo]
--        assert {$idle >= 1000 && $idle <= 1010}
--        r get foo
--    } {bar}
--    
--    test {RESTORE can set LFU} {
--        r set foo bar
--        set encoded [r dump foo]
--        r del foo
--        r config set maxmemory-policy allkeys-lfu
--        r restore foo 0 $encoded freq 100
--        set freq [r object freq foo]
--        assert {$freq == 100}
-+#        catch {r debug object foo} e
-+#        r debug set-active-expire 1
-+#        set e
-         r get foo
--    } {bar}
-+    } {}
-+
-+#    test {RESTORE can set LRU} {
-+#        r set foo bar
-+#        set encoded [r dump foo]
-+#        r del foo
-+#        r config set maxmemory-policy allkeys-lru
-+#        r restore foo 0 $encoded idletime 1000
-+#        set idle [r object idletime foo]
-+#        assert {$idle >= 1000 && $idle <= 1010}
-+#        r get foo
-+#    } {bar}
-+#    
-+#    test {RESTORE can set LFU} {
-+#        r set foo bar
-+#        set encoded [r dump foo]
-+#        r del foo
-+#        r config set maxmemory-policy allkeys-lfu
-+#        r restore foo 0 $encoded freq 100
-+#        set freq [r object freq foo]
-+#        assert {$freq == 100}
-+#        r get foo
-+#    } {bar}
- 
-     test {RESTORE returns an error of the key already exists} {
-         r set foo bar
-@@ -97,283 +98,283 @@ start_server {tags {"dump"}} {
-         r dump nonexisting_key
-     } {}
- 
--    test {MIGRATE is caching connections} {
--        # Note, we run this as first test so that the connection cache
--        # is empty.
--        set first [srv 0 client]
--        r set key "Some Value"
--        start_server {tags {"repl"}} {
--            set second [srv 0 client]
--            set second_host [srv 0 host]
--            set second_port [srv 0 port]
--
--            assert_match {*migrate_cached_sockets:0*} [r -1 info]
--            r -1 migrate $second_host $second_port key 9 1000
--            assert_match {*migrate_cached_sockets:1*} [r -1 info]
--        }
--    }
--
--    test {MIGRATE cached connections are released after some time} {
--        after 15000
--        assert_match {*migrate_cached_sockets:0*} [r info]
--    }
--
--    test {MIGRATE is able to migrate a key between two instances} {
--        set first [srv 0 client]
--        r set key "Some Value"
--        start_server {tags {"repl"}} {
--            set second [srv 0 client]
--            set second_host [srv 0 host]
--            set second_port [srv 0 port]
--
--            assert {[$first exists key] == 1}
--            assert {[$second exists key] == 0}
--            set ret [r -1 migrate $second_host $second_port key 9 5000]
--            assert {$ret eq {OK}}
--            assert {[$first exists key] == 0}
--            assert {[$second exists key] == 1}
--            assert {[$second get key] eq {Some Value}}
--            assert {[$second ttl key] == -1}
--        }
--    }
--
--    test {MIGRATE is able to copy a key between two instances} {
--        set first [srv 0 client]
--        r del list
--        r lpush list a b c d
--        start_server {tags {"repl"}} {
--            set second [srv 0 client]
--            set second_host [srv 0 host]
--            set second_port [srv 0 port]
--
--            assert {[$first exists list] == 1}
--            assert {[$second exists list] == 0}
--            set ret [r -1 migrate $second_host $second_port list 9 5000 copy]
--            assert {$ret eq {OK}}
--            assert {[$first exists list] == 1}
--            assert {[$second exists list] == 1}
--            assert {[$first lrange list 0 -1] eq [$second lrange list 0 -1]}
--        }
--    }
--
--    test {MIGRATE will not overwrite existing keys, unless REPLACE is used} {
--        set first [srv 0 client]
--        r del list
--        r lpush list a b c d
--        start_server {tags {"repl"}} {
--            set second [srv 0 client]
--            set second_host [srv 0 host]
--            set second_port [srv 0 port]
--
--            assert {[$first exists list] == 1}
--            assert {[$second exists list] == 0}
--            $second set list somevalue
--            catch {r -1 migrate $second_host $second_port list 9 5000 copy} e
--            assert_match {ERR*} $e
--            set res [r -1 migrate $second_host $second_port list 9 5000 copy replace]
--            assert {$ret eq {OK}}
--            assert {[$first exists list] == 1}
--            assert {[$second exists list] == 1}
--            assert {[$first lrange list 0 -1] eq [$second lrange list 0 -1]}
--        }
--    }
--
--    test {MIGRATE propagates TTL correctly} {
--        set first [srv 0 client]
--        r set key "Some Value"
--        start_server {tags {"repl"}} {
--            set second [srv 0 client]
--            set second_host [srv 0 host]
--            set second_port [srv 0 port]
--
--            assert {[$first exists key] == 1}
--            assert {[$second exists key] == 0}
--            $first expire key 10
--            set ret [r -1 migrate $second_host $second_port key 9 5000]
--            assert {$ret eq {OK}}
--            assert {[$first exists key] == 0}
--            assert {[$second exists key] == 1}
--            assert {[$second get key] eq {Some Value}}
--            assert {[$second ttl key] >= 7 && [$second ttl key] <= 10}
--        }
--    }
--
--    test {MIGRATE can correctly transfer large values} {
--        set first [srv 0 client]
--        r del key
--        for {set j 0} {$j < 40000} {incr j} {
--            r rpush key 1 2 3 4 5 6 7 8 9 10
--            r rpush key "item 1" "item 2" "item 3" "item 4" "item 5" \
--                        "item 6" "item 7" "item 8" "item 9" "item 10"
--        }
--        assert {[string length [r dump key]] > (1024*64)}
--        start_server {tags {"repl"}} {
--            set second [srv 0 client]
--            set second_host [srv 0 host]
--            set second_port [srv 0 port]
--
--            assert {[$first exists key] == 1}
--            assert {[$second exists key] == 0}
--            set ret [r -1 migrate $second_host $second_port key 9 10000]
--            assert {$ret eq {OK}}
--            assert {[$first exists key] == 0}
--            assert {[$second exists key] == 1}
--            assert {[$second ttl key] == -1}
--            assert {[$second llen key] == 40000*20}
--        }
--    }
--
--    test {MIGRATE can correctly transfer hashes} {
--        set first [srv 0 client]
--        r del key
--        r hmset key field1 "item 1" field2 "item 2" field3 "item 3" \
--                    field4 "item 4" field5 "item 5" field6 "item 6"
--        start_server {tags {"repl"}} {
--            set second [srv 0 client]
--            set second_host [srv 0 host]
--            set second_port [srv 0 port]
--
--            assert {[$first exists key] == 1}
--            assert {[$second exists key] == 0}
--            set ret [r -1 migrate $second_host $second_port key 9 10000]
--            assert {$ret eq {OK}}
--            assert {[$first exists key] == 0}
--            assert {[$second exists key] == 1}
--            assert {[$second ttl key] == -1}
--        }
--    }
--
--    test {MIGRATE timeout actually works} {
--        set first [srv 0 client]
--        r set key "Some Value"
--        start_server {tags {"repl"}} {
--            set second [srv 0 client]
--            set second_host [srv 0 host]
--            set second_port [srv 0 port]
--
--            assert {[$first exists key] == 1}
--            assert {[$second exists key] == 0}
--
--            set rd [redis_deferring_client]
--            $rd debug sleep 1.0 ; # Make second server unable to reply.
--            set e {}
--            catch {r -1 migrate $second_host $second_port key 9 500} e
--            assert_match {IOERR*} $e
--        }
--    }
--
--    test {MIGRATE can migrate multiple keys at once} {
--        set first [srv 0 client]
--        r set key1 "v1"
--        r set key2 "v2"
--        r set key3 "v3"
--        start_server {tags {"repl"}} {
--            set second [srv 0 client]
--            set second_host [srv 0 host]
--            set second_port [srv 0 port]
--
--            assert {[$first exists key1] == 1}
--            assert {[$second exists key1] == 0}
--            set ret [r -1 migrate $second_host $second_port "" 9 5000 keys key1 key2 key3]
--            assert {$ret eq {OK}}
--            assert {[$first exists key1] == 0}
--            assert {[$first exists key2] == 0}
--            assert {[$first exists key3] == 0}
--            assert {[$second get key1] eq {v1}}
--            assert {[$second get key2] eq {v2}}
--            assert {[$second get key3] eq {v3}}
--        }
--    }
--
--    test {MIGRATE with multiple keys must have empty key arg} {
--        catch {r MIGRATE 127.0.0.1 6379 NotEmpty 9 5000 keys a b c} e
--        set e
--    } {*empty string*}
--
--    test {MIGRATE with multiple keys migrate just existing ones} {
--        set first [srv 0 client]
--        r set key1 "v1"
--        r set key2 "v2"
--        r set key3 "v3"
--        start_server {tags {"repl"}} {
--            set second [srv 0 client]
--            set second_host [srv 0 host]
--            set second_port [srv 0 port]
--
--            set ret [r -1 migrate $second_host $second_port "" 9 5000 keys nokey-1 nokey-2 nokey-2]
--            assert {$ret eq {NOKEY}}
--
--            assert {[$first exists key1] == 1}
--            assert {[$second exists key1] == 0}
--            set ret [r -1 migrate $second_host $second_port "" 9 5000 keys nokey-1 key1 nokey-2 key2 nokey-3 key3]
--            assert {$ret eq {OK}}
--            assert {[$first exists key1] == 0}
--            assert {[$first exists key2] == 0}
--            assert {[$first exists key3] == 0}
--            assert {[$second get key1] eq {v1}}
--            assert {[$second get key2] eq {v2}}
--            assert {[$second get key3] eq {v3}}
--        }
--    }
--
--    test {MIGRATE with multiple keys: stress command rewriting} {
--        set first [srv 0 client]
--        r flushdb
--        r mset a 1 b 2 c 3 d 4 c 5 e 6 f 7 g 8 h 9 i 10 l 11 m 12 n 13 o 14 p 15 q 16
--        start_server {tags {"repl"}} {
--            set second [srv 0 client]
--            set second_host [srv 0 host]
--            set second_port [srv 0 port]
--
--            set ret [r -1 migrate $second_host $second_port "" 9 5000 keys a b c d e f g h i l m n o p q]
--
--            assert {[$first dbsize] == 0}
--            assert {[$second dbsize] == 15}
--        }
--    }
--
--    test {MIGRATE with multiple keys: delete just ack keys} {
--        set first [srv 0 client]
--        r flushdb
--        r mset a 1 b 2 c 3 d 4 c 5 e 6 f 7 g 8 h 9 i 10 l 11 m 12 n 13 o 14 p 15 q 16
--        start_server {tags {"repl"}} {
--            set second [srv 0 client]
--            set second_host [srv 0 host]
--            set second_port [srv 0 port]
--
--            $second mset c _ d _; # Two busy keys and no REPLACE used
--
--            catch {r -1 migrate $second_host $second_port "" 9 5000 keys a b c d e f g h i l m n o p q} e
--
--            assert {[$first dbsize] == 2}
--            assert {[$second dbsize] == 15}
--            assert {[$first exists c] == 1}
--            assert {[$first exists d] == 1}
--        }
--    }
--
--    test {MIGRATE AUTH: correct and wrong password cases} {
--        set first [srv 0 client]
--        r del list
--        r lpush list a b c d
--        start_server {tags {"repl"}} {
--            set second [srv 0 client]
--            set second_host [srv 0 host]
--            set second_port [srv 0 port]
--            $second config set requirepass foobar
--            $second auth foobar
--
--            assert {[$first exists list] == 1}
--            assert {[$second exists list] == 0}
--            set ret [r -1 migrate $second_host $second_port list 9 5000 AUTH foobar]
--            assert {$ret eq {OK}}
--            assert {[$second exists list] == 1}
--            assert {[$second lrange list 0 -1] eq {d c b a}}
--
--            r -1 lpush list a b c d
--            $second config set requirepass foobar2
--            catch {r -1 migrate $second_host $second_port list 9 5000 AUTH foobar} err
--            assert_match {*invalid password*} $err
--        }
--    }
-+#    test {MIGRATE is caching connections} {
-+#        # Note, we run this as first test so that the connection cache
-+#        # is empty.
-+#        set first [srv 0 client]
-+#        r set key "Some Value"
-+#        start_server {tags {"repl"}} {
-+#            set second [srv 0 client]
-+#            set second_host [srv 0 host]
-+#            set second_port [srv 0 port]
-+#
-+#            assert_match {*migrate_cached_sockets:0*} [r -1 info]
-+#            r -1 migrate $second_host $second_port key 9 1000
-+#            assert_match {*migrate_cached_sockets:1*} [r -1 info]
-+#        }
-+#    }
-+#
-+#    test {MIGRATE cached connections are released after some time} {
-+#        after 15000
-+#        assert_match {*migrate_cached_sockets:0*} [r info]
-+#    }
-+#
-+#    test {MIGRATE is able to migrate a key between two instances} {
-+#        set first [srv 0 client]
-+#        r set key "Some Value"
-+#        start_server {tags {"repl"}} {
-+#            set second [srv 0 client]
-+#            set second_host [srv 0 host]
-+#            set second_port [srv 0 port]
-+#
-+#            assert {[$first exists key] == 1}
-+#            assert {[$second exists key] == 0}
-+#            set ret [r -1 migrate $second_host $second_port key 9 5000]
-+#            assert {$ret eq {OK}}
-+#            assert {[$first exists key] == 0}
-+#            assert {[$second exists key] == 1}
-+#            assert {[$second get key] eq {Some Value}}
-+#            assert {[$second ttl key] == -1}
-+#        }
-+#    }
-+#
-+#    test {MIGRATE is able to copy a key between two instances} {
-+#        set first [srv 0 client]
-+#        r del list
-+#        r lpush list a b c d
-+#        start_server {tags {"repl"}} {
-+#            set second [srv 0 client]
-+#            set second_host [srv 0 host]
-+#            set second_port [srv 0 port]
-+#
-+#            assert {[$first exists list] == 1}
-+#            assert {[$second exists list] == 0}
-+#            set ret [r -1 migrate $second_host $second_port list 9 5000 copy]
-+#            assert {$ret eq {OK}}
-+#            assert {[$first exists list] == 1}
-+#            assert {[$second exists list] == 1}
-+#            assert {[$first lrange list 0 -1] eq [$second lrange list 0 -1]}
-+#        }
-+#    }
-+#
-+#    test {MIGRATE will not overwrite existing keys, unless REPLACE is used} {
-+#        set first [srv 0 client]
-+#        r del list
-+#        r lpush list a b c d
-+#        start_server {tags {"repl"}} {
-+#            set second [srv 0 client]
-+#            set second_host [srv 0 host]
-+#            set second_port [srv 0 port]
-+#
-+#            assert {[$first exists list] == 1}
-+#            assert {[$second exists list] == 0}
-+#            $second set list somevalue
-+#            catch {r -1 migrate $second_host $second_port list 9 5000 copy} e
-+#            assert_match {ERR*} $e
-+#            set res [r -1 migrate $second_host $second_port list 9 5000 copy replace]
-+#            assert {$ret eq {OK}}
-+#            assert {[$first exists list] == 1}
-+#            assert {[$second exists list] == 1}
-+#            assert {[$first lrange list 0 -1] eq [$second lrange list 0 -1]}
-+#        }
-+#    }
-+#
-+#    test {MIGRATE propagates TTL correctly} {
-+#        set first [srv 0 client]
-+#        r set key "Some Value"
-+#        start_server {tags {"repl"}} {
-+#            set second [srv 0 client]
-+#            set second_host [srv 0 host]
-+#            set second_port [srv 0 port]
-+#
-+#            assert {[$first exists key] == 1}
-+#            assert {[$second exists key] == 0}
-+#            $first expire key 10
-+#            set ret [r -1 migrate $second_host $second_port key 9 5000]
-+#            assert {$ret eq {OK}}
-+#            assert {[$first exists key] == 0}
-+#            assert {[$second exists key] == 1}
-+#            assert {[$second get key] eq {Some Value}}
-+#            assert {[$second ttl key] >= 7 && [$second ttl key] <= 10}
-+#        }
-+#    }
-+#
-+#    test {MIGRATE can correctly transfer large values} {
-+#        set first [srv 0 client]
-+#        r del key
-+#        for {set j 0} {$j < 40000} {incr j} {
-+#            r rpush key 1 2 3 4 5 6 7 8 9 10
-+#            r rpush key "item 1" "item 2" "item 3" "item 4" "item 5" \
-+#                        "item 6" "item 7" "item 8" "item 9" "item 10"
-+#        }
-+#        assert {[string length [r dump key]] > (1024*64)}
-+#        start_server {tags {"repl"}} {
-+#            set second [srv 0 client]
-+#            set second_host [srv 0 host]
-+#            set second_port [srv 0 port]
-+#
-+#            assert {[$first exists key] == 1}
-+#            assert {[$second exists key] == 0}
-+#            set ret [r -1 migrate $second_host $second_port key 9 10000]
-+#            assert {$ret eq {OK}}
-+#            assert {[$first exists key] == 0}
-+#            assert {[$second exists key] == 1}
-+#            assert {[$second ttl key] == -1}
-+#            assert {[$second llen key] == 40000*20}
-+#        }
-+#    }
-+#
-+#    test {MIGRATE can correctly transfer hashes} {
-+#        set first [srv 0 client]
-+#        r del key
-+#        r hmset key field1 "item 1" field2 "item 2" field3 "item 3" \
-+#                    field4 "item 4" field5 "item 5" field6 "item 6"
-+#        start_server {tags {"repl"}} {
-+#            set second [srv 0 client]
-+#            set second_host [srv 0 host]
-+#            set second_port [srv 0 port]
-+#
-+#            assert {[$first exists key] == 1}
-+#            assert {[$second exists key] == 0}
-+#            set ret [r -1 migrate $second_host $second_port key 9 10000]
-+#            assert {$ret eq {OK}}
-+#            assert {[$first exists key] == 0}
-+#            assert {[$second exists key] == 1}
-+#            assert {[$second ttl key] == -1}
-+#        }
-+#    }
-+#
-+#    test {MIGRATE timeout actually works} {
-+#        set first [srv 0 client]
-+#        r set key "Some Value"
-+#        start_server {tags {"repl"}} {
-+#            set second [srv 0 client]
-+#            set second_host [srv 0 host]
-+#            set second_port [srv 0 port]
-+#
-+#            assert {[$first exists key] == 1}
-+#            assert {[$second exists key] == 0}
-+#
-+#            set rd [redis_deferring_client]
-+#            $rd debug sleep 1.0 ; # Make second server unable to reply.
-+#            set e {}
-+#            catch {r -1 migrate $second_host $second_port key 9 500} e
-+#            assert_match {IOERR*} $e
-+#        }
-+#    }
-+#
-+#    test {MIGRATE can migrate multiple keys at once} {
-+#        set first [srv 0 client]
-+#        r set key1 "v1"
-+#        r set key2 "v2"
-+#        r set key3 "v3"
-+#        start_server {tags {"repl"}} {
-+#            set second [srv 0 client]
-+#            set second_host [srv 0 host]
-+#            set second_port [srv 0 port]
-+#
-+#            assert {[$first exists key1] == 1}
-+#            assert {[$second exists key1] == 0}
-+#            set ret [r -1 migrate $second_host $second_port "" 9 5000 keys key1 key2 key3]
-+#            assert {$ret eq {OK}}
-+#            assert {[$first exists key1] == 0}
-+#            assert {[$first exists key2] == 0}
-+#            assert {[$first exists key3] == 0}
-+#            assert {[$second get key1] eq {v1}}
-+#            assert {[$second get key2] eq {v2}}
-+#            assert {[$second get key3] eq {v3}}
-+#        }
-+#    }
-+#
-+#    test {MIGRATE with multiple keys must have empty key arg} {
-+#        catch {r MIGRATE 127.0.0.1 6379 NotEmpty 9 5000 keys a b c} e
-+#        set e
-+#    } {*empty string*}
-+#
-+#    test {MIGRATE with multiple keys migrate just existing ones} {
-+#        set first [srv 0 client]
-+#        r set key1 "v1"
-+#        r set key2 "v2"
-+#        r set key3 "v3"
-+#        start_server {tags {"repl"}} {
-+#            set second [srv 0 client]
-+#            set second_host [srv 0 host]
-+#            set second_port [srv 0 port]
-+#
-+#            set ret [r -1 migrate $second_host $second_port "" 9 5000 keys nokey-1 nokey-2 nokey-2]
-+#            assert {$ret eq {NOKEY}}
-+#
-+#            assert {[$first exists key1] == 1}
-+#            assert {[$second exists key1] == 0}
-+#            set ret [r -1 migrate $second_host $second_port "" 9 5000 keys nokey-1 key1 nokey-2 key2 nokey-3 key3]
-+#            assert {$ret eq {OK}}
-+#            assert {[$first exists key1] == 0}
-+#            assert {[$first exists key2] == 0}
-+#            assert {[$first exists key3] == 0}
-+#            assert {[$second get key1] eq {v1}}
-+#            assert {[$second get key2] eq {v2}}
-+#            assert {[$second get key3] eq {v3}}
-+#        }
-+#    }
-+#
-+#    test {MIGRATE with multiple keys: stress command rewriting} {
-+#        set first [srv 0 client]
-+#        r flushdb
-+#        r mset a 1 b 2 c 3 d 4 c 5 e 6 f 7 g 8 h 9 i 10 l 11 m 12 n 13 o 14 p 15 q 16
-+#        start_server {tags {"repl"}} {
-+#            set second [srv 0 client]
-+#            set second_host [srv 0 host]
-+#            set second_port [srv 0 port]
-+#
-+#            set ret [r -1 migrate $second_host $second_port "" 9 5000 keys a b c d e f g h i l m n o p q]
-+#
-+#            assert {[$first dbsize] == 0}
-+#            assert {[$second dbsize] == 15}
-+#        }
-+#    }
-+#
-+#    test {MIGRATE with multiple keys: delete just ack keys} {
-+#        set first [srv 0 client]
-+#        r flushdb
-+#        r mset a 1 b 2 c 3 d 4 c 5 e 6 f 7 g 8 h 9 i 10 l 11 m 12 n 13 o 14 p 15 q 16
-+#        start_server {tags {"repl"}} {
-+#            set second [srv 0 client]
-+#            set second_host [srv 0 host]
-+#            set second_port [srv 0 port]
-+#
-+#            $second mset c _ d _; # Two busy keys and no REPLACE used
-+#
-+#            catch {r -1 migrate $second_host $second_port "" 9 5000 keys a b c d e f g h i l m n o p q} e
-+#
-+#            assert {[$first dbsize] == 2}
-+#            assert {[$second dbsize] == 15}
-+#            assert {[$first exists c] == 1}
-+#            assert {[$first exists d] == 1}
-+#        }
-+#    }
-+#
-+#    test {MIGRATE AUTH: correct and wrong password cases} {
-+#        set first [srv 0 client]
-+#        r del list
-+#        r lpush list a b c d
-+#        start_server {tags {"repl"}} {
-+#            set second [srv 0 client]
-+#            set second_host [srv 0 host]
-+#            set second_port [srv 0 port]
-+#            $second config set requirepass foobar
-+#            $second auth foobar
-+#
-+#            assert {[$first exists list] == 1}
-+#            assert {[$second exists list] == 0}
-+#            set ret [r -1 migrate $second_host $second_port list 9 5000 AUTH foobar]
-+#            assert {$ret eq {OK}}
-+#            assert {[$second exists list] == 1}
-+#            assert {[$second lrange list 0 -1] eq {d c b a}}
-+#
-+#            r -1 lpush list a b c d
-+#            $second config set requirepass foobar2
-+#            catch {r -1 migrate $second_host $second_port list 9 5000 AUTH foobar} err
-+#            assert_match {*invalid password*} $err
-+#        }
-+#    }
- }
-diff --git a/tests/unit/expire.tcl b/tests/unit/expire.tcl
-index de24eabed..533eca9ac 100644
---- a/tests/unit/expire.tcl
-+++ b/tests/unit/expire.tcl
-@@ -7,7 +7,7 @@ start_server {tags {"expire"}} {
-         set v4 [r ttl x]
-         r expire x 2
-         list $v1 $v2 $v3 $v4
--    } {1 [45] 1 10}
-+    } {1 [45] 1 [19-]0}
- 
-     test {EXPIRE - It should be still possible to read 'x'} {
-         r get x
-@@ -22,11 +22,11 @@ start_server {tags {"expire"}} {
- 
-     test {EXPIRE - write on expire should work} {
-         r del x
--        r lpush x foo
-+        r set x foo
-         r expire x 1000
--        r lpush x bar
--        r lrange x 0 -1
--    } {bar foo}
-+        r set x bar
-+        r get x
-+    } {bar}
- 
-     test {EXPIREAT - Check for EXPIRE alike behavior} {
-         r del x
-@@ -56,16 +56,16 @@ start_server {tags {"expire"}} {
-         } {}
-     }
- 
--    test {SETEX - Wrong time parameter} {
--        catch {r setex z -10 foo} e
--        set _ $e
--    } {*invalid expire*}
-+    #test {SETEX - Wrong time parameter} {
-+    #    catch {r setex z -10 foo} e
-+    #    set _ $e
-+    #} {*invalid expire*}
- 
-     test {PERSIST can undo an EXPIRE} {
-         r set x foo
-         r expire x 50
-         list [r ttl x] [r persist x] [r ttl x] [r get x]
--    } {50 1 -1 foo}
-+    } {[45][90] 1 -1 foo}
- 
-     test {PERSIST returns 0 against non existing or non volatile keys} {
-         r set x foo
-@@ -146,47 +146,47 @@ start_server {tags {"expire"}} {
-         list [r ttl x] [r pttl x]
-     } {-2 -2}
- 
--    test {Redis should actively expire keys incrementally} {
--        r flushdb
--        r psetex key1 500 a
--        r psetex key2 500 a
--        r psetex key3 500 a
--        set size1 [r dbsize]
--        # Redis expires random keys ten times every second so we are
--        # fairly sure that all the three keys should be evicted after
--        # one second.
--        after 1000
--        set size2 [r dbsize]
--        list $size1 $size2
--    } {3 0}
--
--    test {Redis should lazy expire keys} {
--        r flushdb
--        r debug set-active-expire 0
--        r psetex key1 500 a
--        r psetex key2 500 a
--        r psetex key3 500 a
--        set size1 [r dbsize]
--        # Redis expires random keys ten times every second so we are
--        # fairly sure that all the three keys should be evicted after
--        # one second.
--        after 1000
--        set size2 [r dbsize]
--        r mget key1 key2 key3
--        set size3 [r dbsize]
--        r debug set-active-expire 1
--        list $size1 $size2 $size3
--    } {3 3 0}
--
--    test {EXPIRE should not resurrect keys (issue #1026)} {
--        r debug set-active-expire 0
--        r set foo bar
--        r pexpire foo 500
--        after 1000
--        r expire foo 10
--        r debug set-active-expire 1
--        r exists foo
--    } {0}
-+#    test {Redis should actively expire keys incrementally} {
-+#        r flushdb
-+#        r psetex key1 500 a
-+#        r psetex key2 500 a
-+#        r psetex key3 500 a
-+#        set size1 [r dbsize]
-+#        # Redis expires random keys ten times every second so we are
-+#        # fairly sure that all the three keys should be evicted after
-+#        # one second.
-+#        after 1000
-+#        set size2 [r dbsize]
-+#        list $size1 $size2
-+#    } {3 0}
-+
-+ #   test {Redis should lazy expire keys} {
-+ #       r flushdb
-+ #       r debug set-active-expire 0
-+ #       r psetex key1 500 a
-+ #       r psetex key2 500 a
-+ #       r psetex key3 500 a
-+ #       set size1 [r dbsize]
-+ #       # Redis expires random keys ten times every second so we are
-+ #       # fairly sure that all the three keys should be evicted after
-+ #       # one second.
-+ #       after 1000
-+ #       set size2 [r dbsize]
-+ #       r mget key1 key2 key3
-+ #       set size3 [r dbsize]
-+ #       r debug set-active-expire 1
-+ #       list $size1 $size2 $size3
-+ #   } {3 3 0}
-+
-+#    test {EXPIRE should not resurrect keys (issue #1026)} {
-+#        r debug set-active-expire 0
-+#        r set foo bar
-+#        r pexpire foo 500
-+#        after 1000
-+#        r expire foo 10
-+#        r debug set-active-expire 1
-+#        r exists foo
-+#    } {0}
- 
-     test {5 keys in, 5 keys out} {
-         r flushdb
-@@ -205,18 +205,18 @@ start_server {tags {"expire"}} {
-         set e
-     } {*not an integer*}
- 
--    test {SET - use EX/PX option, TTL should not be reseted after loadaof} {
--        r config set appendonly yes
--        r set foo bar EX 100
--        after 2000
--        r debug loadaof
--        set ttl [r ttl foo]
--        assert {$ttl <= 98 && $ttl > 90}
--
--        r set foo bar PX 100000
--        after 2000
--        r debug loadaof
--        set ttl [r ttl foo]
--        assert {$ttl <= 98 && $ttl > 90}
--    }
-+#    test {SET - use EX/PX option, TTL should not be reseted after loadaof} {
-+#        r config set appendonly yes
-+#        r set foo bar EX 100
-+#        after 2000
-+#        r debug loadaof
-+#        set ttl [r ttl foo]
-+#        assert {$ttl <= 98 && $ttl > 90}
-+#
-+#        r set foo bar PX 100000
-+#        after 2000
-+#        r debug loadaof
-+#        set ttl [r ttl foo]
-+#        assert {$ttl <= 98 && $ttl > 90}
-+#    }
- }
-diff --git a/tests/unit/pubsub.tcl b/tests/unit/pubsub.tcl
-index 9c7a43bf0..16173b654 100644
---- a/tests/unit/pubsub.tcl
-+++ b/tests/unit/pubsub.tcl
-@@ -107,6 +107,7 @@ start_server {tags {"pubsub"}} {
-         set rd1 [redis_deferring_client]
-         assert_equal {1 2 3} [subscribe $rd1 {chan1 chan2 chan3}]
-         unsubscribe $rd1
-+        after 500
-         assert_equal 0 [r publish chan1 hello]
-         assert_equal 0 [r publish chan2 hello]
-         assert_equal 0 [r publish chan3 hello]
-@@ -180,6 +181,7 @@ start_server {tags {"pubsub"}} {
-         set rd1 [redis_deferring_client]
-         assert_equal {1 2 3} [psubscribe $rd1 {chan1.* chan2.* chan3.*}]
-         punsubscribe $rd1
-+        after 500
-         assert_equal 0 [r publish chan1.hi hello]
-         assert_equal 0 [r publish chan2.hi hello]
-         assert_equal 0 [r publish chan3.hi hello]
-@@ -223,168 +225,168 @@ start_server {tags {"pubsub"}} {
-         concat $reply1 $reply2
-     } {punsubscribe {} 0 unsubscribe {} 0}
- 
--    ### Keyspace events notification tests
--
--    test "Keyspace notifications: we receive keyspace notifications" {
--        r config set notify-keyspace-events KA
--        set rd1 [redis_deferring_client]
--        assert_equal {1} [psubscribe $rd1 *]
--        r set foo bar
--        assert_equal {pmessage * __keyspace@9__:foo set} [$rd1 read]
--        $rd1 close
--    }
--
--    test "Keyspace notifications: we receive keyevent notifications" {
--        r config set notify-keyspace-events EA
--        set rd1 [redis_deferring_client]
--        assert_equal {1} [psubscribe $rd1 *]
--        r set foo bar
--        assert_equal {pmessage * __keyevent@9__:set foo} [$rd1 read]
--        $rd1 close
--    }
--
--    test "Keyspace notifications: we can receive both kind of events" {
--        r config set notify-keyspace-events KEA
--        set rd1 [redis_deferring_client]
--        assert_equal {1} [psubscribe $rd1 *]
--        r set foo bar
--        assert_equal {pmessage * __keyspace@9__:foo set} [$rd1 read]
--        assert_equal {pmessage * __keyevent@9__:set foo} [$rd1 read]
--        $rd1 close
--    }
--
--    test "Keyspace notifications: we are able to mask events" {
--        r config set notify-keyspace-events KEl
--        r del mylist
--        set rd1 [redis_deferring_client]
--        assert_equal {1} [psubscribe $rd1 *]
--        r set foo bar
--        r lpush mylist a
--        # No notification for set, because only list commands are enabled.
--        assert_equal {pmessage * __keyspace@9__:mylist lpush} [$rd1 read]
--        assert_equal {pmessage * __keyevent@9__:lpush mylist} [$rd1 read]
--        $rd1 close
--    }
--
--    test "Keyspace notifications: general events test" {
--        r config set notify-keyspace-events KEg
--        set rd1 [redis_deferring_client]
--        assert_equal {1} [psubscribe $rd1 *]
--        r set foo bar
--        r expire foo 1
--        r del foo
--        assert_equal {pmessage * __keyspace@9__:foo expire} [$rd1 read]
--        assert_equal {pmessage * __keyevent@9__:expire foo} [$rd1 read]
--        assert_equal {pmessage * __keyspace@9__:foo del} [$rd1 read]
--        assert_equal {pmessage * __keyevent@9__:del foo} [$rd1 read]
--        $rd1 close
--    }
--
--    test "Keyspace notifications: list events test" {
--        r config set notify-keyspace-events KEl
--        r del mylist
--        set rd1 [redis_deferring_client]
--        assert_equal {1} [psubscribe $rd1 *]
--        r lpush mylist a
--        r rpush mylist a
--        r rpop mylist
--        assert_equal {pmessage * __keyspace@9__:mylist lpush} [$rd1 read]
--        assert_equal {pmessage * __keyevent@9__:lpush mylist} [$rd1 read]
--        assert_equal {pmessage * __keyspace@9__:mylist rpush} [$rd1 read]
--        assert_equal {pmessage * __keyevent@9__:rpush mylist} [$rd1 read]
--        assert_equal {pmessage * __keyspace@9__:mylist rpop} [$rd1 read]
--        assert_equal {pmessage * __keyevent@9__:rpop mylist} [$rd1 read]
--        $rd1 close
--    }
--
--    test "Keyspace notifications: set events test" {
--        r config set notify-keyspace-events Ks
--        r del myset
--        set rd1 [redis_deferring_client]
--        assert_equal {1} [psubscribe $rd1 *]
--        r sadd myset a b c d
--        r srem myset x
--        r sadd myset x y z
--        r srem myset x
--        assert_equal {pmessage * __keyspace@9__:myset sadd} [$rd1 read]
--        assert_equal {pmessage * __keyspace@9__:myset sadd} [$rd1 read]
--        assert_equal {pmessage * __keyspace@9__:myset srem} [$rd1 read]
--        $rd1 close
--    }
--
--    test "Keyspace notifications: zset events test" {
--        r config set notify-keyspace-events Kz
--        r del myzset
--        set rd1 [redis_deferring_client]
--        assert_equal {1} [psubscribe $rd1 *]
--        r zadd myzset 1 a 2 b
--        r zrem myzset x
--        r zadd myzset 3 x 4 y 5 z
--        r zrem myzset x
--        assert_equal {pmessage * __keyspace@9__:myzset zadd} [$rd1 read]
--        assert_equal {pmessage * __keyspace@9__:myzset zadd} [$rd1 read]
--        assert_equal {pmessage * __keyspace@9__:myzset zrem} [$rd1 read]
--        $rd1 close
--    }
--
--    test "Keyspace notifications: hash events test" {
--        r config set notify-keyspace-events Kh
--        r del myhash
--        set rd1 [redis_deferring_client]
--        assert_equal {1} [psubscribe $rd1 *]
--        r hmset myhash yes 1 no 0
--        r hincrby myhash yes 10
--        assert_equal {pmessage * __keyspace@9__:myhash hset} [$rd1 read]
--        assert_equal {pmessage * __keyspace@9__:myhash hincrby} [$rd1 read]
--        $rd1 close
--    }
--
--    test "Keyspace notifications: expired events (triggered expire)" {
--        r config set notify-keyspace-events Ex
--        r del foo
--        set rd1 [redis_deferring_client]
--        assert_equal {1} [psubscribe $rd1 *]
--        r psetex foo 100 1
--        wait_for_condition 50 100 {
--            [r exists foo] == 0
--        } else {
--            fail "Key does not expire?!"
--        }
--        assert_equal {pmessage * __keyevent@9__:expired foo} [$rd1 read]
--        $rd1 close
--    }
--
--    test "Keyspace notifications: expired events (background expire)" {
--        r config set notify-keyspace-events Ex
--        r del foo
--        set rd1 [redis_deferring_client]
--        assert_equal {1} [psubscribe $rd1 *]
--        r psetex foo 100 1
--        assert_equal {pmessage * __keyevent@9__:expired foo} [$rd1 read]
--        $rd1 close
--    }
--
--    test "Keyspace notifications: evicted events" {
--        r config set notify-keyspace-events Ee
--        r config set maxmemory-policy allkeys-lru
--        r flushdb
--        set rd1 [redis_deferring_client]
--        assert_equal {1} [psubscribe $rd1 *]
--        r set foo bar
--        r config set maxmemory 1
--        assert_equal {pmessage * __keyevent@9__:evicted foo} [$rd1 read]
--        r config set maxmemory 0
--        $rd1 close
--    }
--
--    test "Keyspace notifications: test CONFIG GET/SET of event flags" {
--        r config set notify-keyspace-events gKE
--        assert_equal {gKE} [lindex [r config get notify-keyspace-events] 1]
--        r config set notify-keyspace-events {$lshzxeKE}
--        assert_equal {$lshzxeKE} [lindex [r config get notify-keyspace-events] 1]
--        r config set notify-keyspace-events KA
--        assert_equal {AK} [lindex [r config get notify-keyspace-events] 1]
--        r config set notify-keyspace-events EA
--        assert_equal {AE} [lindex [r config get notify-keyspace-events] 1]
--    }
-+#    ### Keyspace events notification tests
-+#
-+#    test "Keyspace notifications: we receive keyspace notifications" {
-+#        r config set notify-keyspace-events KA
-+#        set rd1 [redis_deferring_client]
-+#        assert_equal {1} [psubscribe $rd1 *]
-+#        r set foo bar
-+#        assert_equal {pmessage * __keyspace@9__:foo set} [$rd1 read]
-+#        $rd1 close
-+#    }
-+#
-+#    test "Keyspace notifications: we receive keyevent notifications" {
-+#        r config set notify-keyspace-events EA
-+#        set rd1 [redis_deferring_client]
-+#        assert_equal {1} [psubscribe $rd1 *]
-+#        r set foo bar
-+#        assert_equal {pmessage * __keyevent@9__:set foo} [$rd1 read]
-+#        $rd1 close
-+#    }
-+#
-+#    test "Keyspace notifications: we can receive both kind of events" {
-+#        r config set notify-keyspace-events KEA
-+#        set rd1 [redis_deferring_client]
-+#        assert_equal {1} [psubscribe $rd1 *]
-+#        r set foo bar
-+#        assert_equal {pmessage * __keyspace@9__:foo set} [$rd1 read]
-+#        assert_equal {pmessage * __keyevent@9__:set foo} [$rd1 read]
-+#        $rd1 close
-+#    }
-+#
-+#    test "Keyspace notifications: we are able to mask events" {
-+#        r config set notify-keyspace-events KEl
-+#        r del mylist
-+#        set rd1 [redis_deferring_client]
-+#        assert_equal {1} [psubscribe $rd1 *]
-+#        r set foo bar
-+#        r lpush mylist a
-+#        # No notification for set, because only list commands are enabled.
-+#        assert_equal {pmessage * __keyspace@9__:mylist lpush} [$rd1 read]
-+#        assert_equal {pmessage * __keyevent@9__:lpush mylist} [$rd1 read]
-+#        $rd1 close
-+#    }
-+#
-+#    test "Keyspace notifications: general events test" {
-+#        r config set notify-keyspace-events KEg
-+#        set rd1 [redis_deferring_client]
-+#        assert_equal {1} [psubscribe $rd1 *]
-+#        r set foo bar
-+#        r expire foo 1
-+#        r del foo
-+#        assert_equal {pmessage * __keyspace@9__:foo expire} [$rd1 read]
-+#        assert_equal {pmessage * __keyevent@9__:expire foo} [$rd1 read]
-+#        assert_equal {pmessage * __keyspace@9__:foo del} [$rd1 read]
-+#        assert_equal {pmessage * __keyevent@9__:del foo} [$rd1 read]
-+#        $rd1 close
-+#    }
-+#
-+#    test "Keyspace notifications: list events test" {
-+#        r config set notify-keyspace-events KEl
-+#        r del mylist
-+#        set rd1 [redis_deferring_client]
-+#        assert_equal {1} [psubscribe $rd1 *]
-+#        r lpush mylist a
-+#        r rpush mylist a
-+#        r rpop mylist
-+#        assert_equal {pmessage * __keyspace@9__:mylist lpush} [$rd1 read]
-+#        assert_equal {pmessage * __keyevent@9__:lpush mylist} [$rd1 read]
-+#        assert_equal {pmessage * __keyspace@9__:mylist rpush} [$rd1 read]
-+#        assert_equal {pmessage * __keyevent@9__:rpush mylist} [$rd1 read]
-+#        assert_equal {pmessage * __keyspace@9__:mylist rpop} [$rd1 read]
-+#        assert_equal {pmessage * __keyevent@9__:rpop mylist} [$rd1 read]
-+#        $rd1 close
-+#    }
-+#
-+#    test "Keyspace notifications: set events test" {
-+#        r config set notify-keyspace-events Ks
-+#        r del myset
-+#        set rd1 [redis_deferring_client]
-+#        assert_equal {1} [psubscribe $rd1 *]
-+#        r sadd myset a b c d
-+#        r srem myset x
-+#        r sadd myset x y z
-+#        r srem myset x
-+#        assert_equal {pmessage * __keyspace@9__:myset sadd} [$rd1 read]
-+#        assert_equal {pmessage * __keyspace@9__:myset sadd} [$rd1 read]
-+#        assert_equal {pmessage * __keyspace@9__:myset srem} [$rd1 read]
-+#        $rd1 close
-+#    }
-+#
-+#    test "Keyspace notifications: zset events test" {
-+#        r config set notify-keyspace-events Kz
-+#        r del myzset
-+#        set rd1 [redis_deferring_client]
-+#        assert_equal {1} [psubscribe $rd1 *]
-+#        r zadd myzset 1 a 2 b
-+#        r zrem myzset x
-+#        r zadd myzset 3 x 4 y 5 z
-+#        r zrem myzset x
-+#        assert_equal {pmessage * __keyspace@9__:myzset zadd} [$rd1 read]
-+#        assert_equal {pmessage * __keyspace@9__:myzset zadd} [$rd1 read]
-+#        assert_equal {pmessage * __keyspace@9__:myzset zrem} [$rd1 read]
-+#        $rd1 close
-+#    }
-+#
-+#    test "Keyspace notifications: hash events test" {
-+#        r config set notify-keyspace-events Kh
-+#        r del myhash
-+#        set rd1 [redis_deferring_client]
-+#        assert_equal {1} [psubscribe $rd1 *]
-+#        r hmset myhash yes 1 no 0
-+#        r hincrby myhash yes 10
-+#        assert_equal {pmessage * __keyspace@9__:myhash hset} [$rd1 read]
-+#        assert_equal {pmessage * __keyspace@9__:myhash hincrby} [$rd1 read]
-+#        $rd1 close
-+#    }
-+#
-+#    test "Keyspace notifications: expired events (triggered expire)" {
-+#        r config set notify-keyspace-events Ex
-+#        r del foo
-+#        set rd1 [redis_deferring_client]
-+#        assert_equal {1} [psubscribe $rd1 *]
-+#        r psetex foo 100 1
-+#        wait_for_condition 50 100 {
-+#            [r exists foo] == 0
-+#        } else {
-+#            fail "Key does not expire?!"
-+#        }
-+#        assert_equal {pmessage * __keyevent@9__:expired foo} [$rd1 read]
-+#        $rd1 close
-+#    }
-+#
-+#    test "Keyspace notifications: expired events (background expire)" {
-+#        r config set notify-keyspace-events Ex
-+#        r del foo
-+#        set rd1 [redis_deferring_client]
-+#        assert_equal {1} [psubscribe $rd1 *]
-+#        r psetex foo 100 1
-+#        assert_equal {pmessage * __keyevent@9__:expired foo} [$rd1 read]
-+#        $rd1 close
-+#    }
-+#
-+#    test "Keyspace notifications: evicted events" {
-+#        r config set notify-keyspace-events Ee
-+#        r config set maxmemory-policy allkeys-lru
-+#        r flushdb
-+#        set rd1 [redis_deferring_client]
-+#        assert_equal {1} [psubscribe $rd1 *]
-+#        r set foo bar
-+#        r config set maxmemory 1
-+#        assert_equal {pmessage * __keyevent@9__:evicted foo} [$rd1 read]
-+#        r config set maxmemory 0
-+#        $rd1 close
-+#    }
-+#
-+#    test "Keyspace notifications: test CONFIG GET/SET of event flags" {
-+#        r config set notify-keyspace-events gKE
-+#        assert_equal {gKE} [lindex [r config get notify-keyspace-events] 1]
-+#        r config set notify-keyspace-events {$lshzxeKE}
-+#        assert_equal {$lshzxeKE} [lindex [r config get notify-keyspace-events] 1]
-+#        r config set notify-keyspace-events KA
-+#        assert_equal {AK} [lindex [r config get notify-keyspace-events] 1]
-+#        r config set notify-keyspace-events EA
-+#        assert_equal {AE} [lindex [r config get notify-keyspace-events] 1]
-+#    }
- }
-diff --git a/tests/unit/quit.tcl b/tests/unit/quit.tcl
-index 4cf440abf..990513d50 100644
---- a/tests/unit/quit.tcl
-+++ b/tests/unit/quit.tcl
-@@ -16,17 +16,18 @@ start_server {tags {"quit"}} {
-     test "Pipelined commands after QUIT must not be executed" {
-         reconnect
-         r write [format_command quit]
--        r write [format_command set foo bar]
-+        r write [format_command set foox bar]
-         r flush
-         assert_equal OK [r read]
-         assert_error * {r read}
- 
-         reconnect
--        assert_equal {} [r get foo]
-+        assert_equal {} [r get foox]
-     }
- 
-     test "Pipelined commands after QUIT that exceed read buffer size" {
-         reconnect
-+        r del foo
-         r write [format_command quit]
-         r write [format_command set foo [string repeat "x" 1024]]
-         r flush
-diff --git a/tests/unit/type/hash.tcl b/tests/unit/type/hash.tcl
-index d2c679d32..6d17de48b 100644
---- a/tests/unit/type/hash.tcl
-+++ b/tests/unit/type/hash.tcl
-@@ -252,10 +252,10 @@ start_server {tags {"hash"}} {
-         lappend rv [r hexists bighash nokey]
-     } {1 0 1 0}
- 
--    test {Is a ziplist encoded Hash promoted on big payload?} {
--        r hset smallhash foo [string repeat a 1024]
--        r debug object smallhash
--    } {*hashtable*}
-+    #test {Is a ziplist encoded Hash promoted on big payload?} {
-+        #r hset smallhash foo [string repeat a 1024]
-+        #r debug object smallhash
-+    #} {*hashtable*}
- 
-     test {HINCRBY against non existing database key} {
-         r del htest
-@@ -505,16 +505,16 @@ start_server {tags {"hash"}} {
-         }
-     }
- 
--    test {Stress test the hash ziplist -> hashtable encoding conversion} {
--        r config set hash-max-ziplist-entries 32
--        for {set j 0} {$j < 100} {incr j} {
--            r del myhash
--            for {set i 0} {$i < 64} {incr i} {
--                r hset myhash [randomValue] [randomValue]
--            }
--            assert {[r object encoding myhash] eq {hashtable}}
--        }
--    }
-+#    test {Stress test the hash ziplist -> hashtable encoding conversion} {
-+#        r config set hash-max-ziplist-entries 32
-+#        for {set j 0} {$j < 100} {incr j} {
-+#            r del myhash
-+#            for {set i 0} {$i < 64} {incr i} {
-+#                r hset myhash [randomValue] [randomValue]
-+#            }
-+#            assert {[r object encoding myhash] eq {hashtable}}
-+#        }
-+#    }
- 
-     # The following test can only be executed if we don't use Valgrind, and if
-     # we are using x86_64 architecture, because:
-diff --git a/tests/unit/type/set.tcl b/tests/unit/type/set.tcl
-index 7b467f1c4..21f0721c4 100644
---- a/tests/unit/type/set.tcl
-+++ b/tests/unit/type/set.tcl
-@@ -34,8 +34,8 @@ start_server {
-     }
- 
-     test {SADD against non set} {
--        r lpush mylist foo
--        assert_error WRONGTYPE* {r sadd mylist bar}
-+        r set mystring foo
-+        assert_error WRONGTYPE* {r sadd mystring bar}
-     }
- 
-     test "SADD a non-integer against an intset" {
-@@ -75,7 +75,7 @@ start_server {
-         assert_encoding hashtable mylargeintset
-         assert_encoding hashtable myhashset
- 
--        r debug reload
-+        #r debug reload
-         assert_encoding intset myintset
-         assert_encoding hashtable mylargeintset
-         assert_encoding hashtable myhashset
-@@ -157,7 +157,7 @@ start_server {
-         }
- 
-         test "SINTERSTORE with two sets, after a DEBUG RELOAD - $type" {
--            r debug reload
-+            #r debug reload
-             r sinterstore setres set1 set2
-             assert_encoding $type setres
-             assert_equal [list 195 196 197 198 199 $large] [lsort [r smembers setres]]
-diff --git a/tests/unit/type/string.tcl b/tests/unit/type/string.tcl
-index 7122fd987..2274c82cc 100644
---- a/tests/unit/type/string.tcl
-+++ b/tests/unit/type/string.tcl
-@@ -130,8 +130,8 @@ start_server {tags {"string"}} {
-     } {bar xyz}
- 
-     test {MSET base case} {
--        r mset x 10 y "foo bar" z "x x x x x x x\n\n\r\n"
--        r mget x y z
-+        r mset "{A}x" 10 "{A}y" "foo bar" "{A}z" "x x x x x x x\n\n\r\n"
-+        r mget "{A}x" "{A}y" "{A}z"
-     } [list 10 {foo bar} "x x x x x x x\n\n\r\n"]
- 
-     test {MSET wrong number of args} {
-@@ -140,11 +140,11 @@ start_server {tags {"string"}} {
-     } {*wrong number*}
- 
-     test {MSETNX with already existent key} {
--        list [r msetnx x1 xxx y2 yyy x 20] [r exists x1] [r exists y2]
-+        list [r msetnx "{A}x1" xxx "{A}y2" yyy "{A}x" 20] [r exists "{A}x1"] [r exists "{A}y2"]
-     } {0 0 0}
- 
-     test {MSETNX with not existing keys} {
--        list [r msetnx x1 xxx y2 yyy] [r get x1] [r get y2]
-+        list [r msetnx "{A}x1" xxx "{A}y2" yyy] [r get "{A}x1"] [r get "{A}y2"]
-     } {1 xxx yyy}
- 
-     test "STRLEN against non-existing key" {
-@@ -188,11 +188,11 @@ start_server {tags {"string"}} {
-         assert_equal [binary format B* 00010011] [r get mykey]
-     }
- 
--    test "SETBIT against key with wrong type" {
--        r del mykey
--        r lpush mykey "foo"
--        assert_error "WRONGTYPE*" {r setbit mykey 0 1}
--    }
-+#    test "SETBIT against key with wrong type" {
-+#        r del mykey
-+#        r lpush mykey "foo"
-+#        assert_error "WRONGTYPE*" {r setbit mykey 0 1}
-+#    }
- 
-     test "SETBIT with out of range bit offset" {
-         r del mykey
-@@ -208,23 +208,23 @@ start_server {tags {"string"}} {
-         assert_error "*out of range*" {r setbit mykey 0 20}
-     }
- 
--    test "SETBIT fuzzing" {
--        set str ""
--        set len [expr 256*8]
--        r del mykey
-+#    test "SETBIT fuzzing" {
-+#        set str ""
-+#        set len [expr 256*8]
-+#        r del mykey
- 
--        for {set i 0} {$i < 2000} {incr i} {
--            set bitnum [randomInt $len]
--            set bitval [randomInt 2]
--            set fmt [format "%%-%ds%%d%%-s" $bitnum]
--            set head [string range $str 0 $bitnum-1]
--            set tail [string range $str $bitnum+1 end]
--            set str [string map {" " 0} [format $fmt $head $bitval $tail]]
-+#        for {set i 0} {$i < 2000} {incr i} {
-+#            set bitnum [randomInt $len]
-+#            set bitval [randomInt 2]
-+#            set fmt [format "%%-%ds%%d%%-s" $bitnum]
-+#            set head [string range $str 0 $bitnum-1]
-+#            set tail [string range $str $bitnum+1 end]
-+#            set str [string map {" " 0} [format $fmt $head $bitval $tail]]
- 
--            r setbit mykey $bitnum $bitval
--            assert_equal [binary format B* $str] [r get mykey]
--        }
--    }
-+#            r setbit mykey $bitnum $bitval
-+#            assert_equal [binary format B* $str] [r get mykey]
-+#        }
-+#    }
- 
-     test "GETBIT against non-existing key" {
-         r del mykey
-@@ -324,7 +324,7 @@ start_server {tags {"string"}} {
- 
-     test "SETRANGE against key with wrong type" {
-         r del mykey
--        r lpush mykey "foo"
-+        r sadd mykey "foo"
-         assert_error "WRONGTYPE*" {r setrange mykey 0 bar}
-     }
- 
-diff --git a/tests/unit/type/zset.tcl b/tests/unit/type/zset.tcl
-index a8c817f6e..d0809b581 100644
---- a/tests/unit/type/zset.tcl
-+++ b/tests/unit/type/zset.tcl
-@@ -7,22 +7,22 @@ start_server {tags {"zset"}} {
-     }
- 
-     proc basics {encoding} {
--        if {$encoding == "ziplist"} {
--            r config set zset-max-ziplist-entries 128
--            r config set zset-max-ziplist-value 64
--        } elseif {$encoding == "skiplist"} {
--            r config set zset-max-ziplist-entries 0
--            r config set zset-max-ziplist-value 0
--        } else {
--            puts "Unknown sorted set encoding"
--            exit
--        }
--
--        test "Check encoding - $encoding" {
--            r del ztmp
--            r zadd ztmp 10 x
--            assert_encoding $encoding ztmp
--        }
-+        # if {$encoding == "ziplist"} {
-+        #     r config set zset-max-ziplist-entries 128
-+        #     r config set zset-max-ziplist-value 64
-+        # } elseif {$encoding == "skiplist"} {
-+        #     r config set zset-max-ziplist-entries 0
-+        #     r config set zset-max-ziplist-value 0
-+        # } else {
-+        #     puts "Unknown sorted set encoding"
-+        #     exit
-+        # }
-+
-+        # test "Check encoding - $encoding" {
-+        #     r del ztmp
-+        #     r zadd ztmp 10 x
-+        #     assert_encoding $encoding ztmp
-+        # }
- 
-         test "ZSET basic ZADD and score update - $encoding" {
-             r del ztmp
-@@ -40,7 +40,7 @@ start_server {tags {"zset"}} {
-         }
- 
-         test "ZSET element can't be set to NaN with ZINCRBY" {
--            assert_error "*not*float*" {r zadd myzset nan abc}
-+            assert_error "*not*float*" {r zincrby myzset nan abc}
-         }
- 
-         test "ZADD with options syntax error with incomplete pair" {
-@@ -257,10 +257,10 @@ start_server {tags {"zset"}} {
-             assert_equal 1 [r zrank zranktmp y]
-             assert_equal 2 [r zrank zranktmp z]
-             assert_equal "" [r zrank zranktmp foo]
--            assert_equal 2 [r zrevrank zranktmp x]
--            assert_equal 1 [r zrevrank zranktmp y]
--            assert_equal 0 [r zrevrank zranktmp z]
--            assert_equal "" [r zrevrank zranktmp foo]
-+            # assert_equal 2 [r zrevrank zranktmp x]
-+            # assert_equal 1 [r zrevrank zranktmp y]
-+            # assert_equal 0 [r zrevrank zranktmp z]
-+            # assert_equal "" [r zrevrank zranktmp foo]
-         }
- 
-         test "ZRANK - after deletion - $encoding" {
-@@ -376,145 +376,145 @@ start_server {tags {"zset"}} {
-             assert_equal {d 3 c 2} [r zrevrangebyscore zset 5 2 LIMIT 2 3 WITHSCORES]
-         }
- 
--        test "ZRANGEBYSCORE with non-value min or max" {
--            assert_error "*not*float*" {r zrangebyscore fooz str 1}
--            assert_error "*not*float*" {r zrangebyscore fooz 1 str}
--            assert_error "*not*float*" {r zrangebyscore fooz 1 NaN}
--        }
--
--        proc create_default_lex_zset {} {
--            create_zset zset {0 alpha 0 bar 0 cool 0 down
--                              0 elephant 0 foo 0 great 0 hill
--                              0 omega}
--        }
--
--        test "ZRANGEBYLEX/ZREVRANGEBYLEX/ZLEXCOUNT basics" {
--            create_default_lex_zset
--
--            # inclusive range
--            assert_equal {alpha bar cool} [r zrangebylex zset - \[cool]
--            assert_equal {bar cool down} [r zrangebylex zset \[bar \[down]
--            assert_equal {great hill omega} [r zrangebylex zset \[g +]
--            assert_equal {cool bar alpha} [r zrevrangebylex zset \[cool -]
--            assert_equal {down cool bar} [r zrevrangebylex zset \[down \[bar]
--            assert_equal {omega hill great foo elephant down} [r zrevrangebylex zset + \[d]
--            assert_equal 3 [r zlexcount zset \[ele \[h]
--
--            # exclusive range
--            assert_equal {alpha bar} [r zrangebylex zset - (cool]
--            assert_equal {cool} [r zrangebylex zset (bar (down]
--            assert_equal {hill omega} [r zrangebylex zset (great +]
--            assert_equal {bar alpha} [r zrevrangebylex zset (cool -]
--            assert_equal {cool} [r zrevrangebylex zset (down (bar]
--            assert_equal {omega hill} [r zrevrangebylex zset + (great]
--            assert_equal 2 [r zlexcount zset (ele (great]
--
--            # inclusive and exclusive
--            assert_equal {} [r zrangebylex zset (az (b]
--            assert_equal {} [r zrangebylex zset (z +]
--            assert_equal {} [r zrangebylex zset - \[aaaa]
--            assert_equal {} [r zrevrangebylex zset \[elez \[elex]
--            assert_equal {} [r zrevrangebylex zset (hill (omega]
--        }
-+        #test "ZRANGEBYSCORE with non-value min or max" {
-+            #assert_error "*not*float*" {r zrangebyscore fooz str 1}
-+            #assert_error "*not*float*" {r zrangebyscore fooz 1 str}
-+        #    assert_error "*not*float*" {r zrangebyscore fooz 1 NaN}
-+        #}
-+
-+        # proc create_default_lex_zset {} {
-+        #     create_zset zset {0 alpha 0 bar 0 cool 0 down
-+        #                       0 elephant 0 foo 0 great 0 hill
-+        #                       0 omega}
-+        # }
-+
-+        # test "ZRANGEBYLEX/ZREVRANGEBYLEX/ZLEXCOUNT basics" {
-+        #     create_default_lex_zset
-+
-+        #     # inclusive range
-+        #     assert_equal {alpha bar cool} [r zrangebylex zset - \[cool]
-+        #     assert_equal {bar cool down} [r zrangebylex zset \[bar \[down]
-+        #     assert_equal {great hill omega} [r zrangebylex zset \[g +]
-+        #     assert_equal {cool bar alpha} [r zrevrangebylex zset \[cool -]
-+        #     assert_equal {down cool bar} [r zrevrangebylex zset \[down \[bar]
-+        #     assert_equal {omega hill great foo elephant down} [r zrevrangebylex zset + \[d]
-+        #     assert_equal 3 [r zlexcount zset \[ele \[h]
-+
-+        #     # exclusive range
-+        #     assert_equal {alpha bar} [r zrangebylex zset - (cool]
-+        #     assert_equal {cool} [r zrangebylex zset (bar (down]
-+        #     assert_equal {hill omega} [r zrangebylex zset (great +]
-+        #     assert_equal {bar alpha} [r zrevrangebylex zset (cool -]
-+        #     assert_equal {cool} [r zrevrangebylex zset (down (bar]
-+        #     assert_equal {omega hill} [r zrevrangebylex zset + (great]
-+        #     assert_equal 2 [r zlexcount zset (ele (great]
-+
-+        #     # inclusive and exclusive
-+        #     assert_equal {} [r zrangebylex zset (az (b]
-+        #     assert_equal {} [r zrangebylex zset (z +]
-+        #     assert_equal {} [r zrangebylex zset - \[aaaa]
-+        #     assert_equal {} [r zrevrangebylex zset \[elez \[elex]
-+        #     assert_equal {} [r zrevrangebylex zset (hill (omega]
-+        # }
-         
--        test "ZLEXCOUNT advanced" {
--            create_default_lex_zset
-+        # test "ZLEXCOUNT advanced" {
-+        #     create_default_lex_zset
-     
--            assert_equal 9 [r zlexcount zset - +]
--            assert_equal 0 [r zlexcount zset + -]
--            assert_equal 0 [r zlexcount zset + \[c]
--            assert_equal 0 [r zlexcount zset \[c -]
--            assert_equal 8 [r zlexcount zset \[bar +]
--            assert_equal 5 [r zlexcount zset \[bar \[foo]
--            assert_equal 4 [r zlexcount zset \[bar (foo]
--            assert_equal 4 [r zlexcount zset (bar \[foo]
--            assert_equal 3 [r zlexcount zset (bar (foo]
--            assert_equal 5 [r zlexcount zset - (foo]
--            assert_equal 1 [r zlexcount zset (maxstring +]
--        }
--
--        test "ZRANGEBYSLEX with LIMIT" {
--            create_default_lex_zset
--            assert_equal {alpha bar} [r zrangebylex zset - \[cool LIMIT 0 2]
--            assert_equal {bar cool} [r zrangebylex zset - \[cool LIMIT 1 2]
--            assert_equal {} [r zrangebylex zset \[bar \[down LIMIT 0 0]
--            assert_equal {} [r zrangebylex zset \[bar \[down LIMIT 2 0]
--            assert_equal {bar} [r zrangebylex zset \[bar \[down LIMIT 0 1]
--            assert_equal {cool} [r zrangebylex zset \[bar \[down LIMIT 1 1]
--            assert_equal {bar cool down} [r zrangebylex zset \[bar \[down LIMIT 0 100]
--            assert_equal {omega hill great foo elephant} [r zrevrangebylex zset + \[d LIMIT 0 5]
--            assert_equal {omega hill great foo} [r zrevrangebylex zset + \[d LIMIT 0 4]
--        }
--
--        test "ZRANGEBYLEX with invalid lex range specifiers" {
--            assert_error "*not*string*" {r zrangebylex fooz foo bar}
--            assert_error "*not*string*" {r zrangebylex fooz \[foo bar}
--            assert_error "*not*string*" {r zrangebylex fooz foo \[bar}
--            assert_error "*not*string*" {r zrangebylex fooz +x \[bar}
--            assert_error "*not*string*" {r zrangebylex fooz -x \[bar}
--        }
--
--        test "ZREMRANGEBYSCORE basics" {
--            proc remrangebyscore {min max} {
--                create_zset zset {1 a 2 b 3 c 4 d 5 e}
--                assert_equal 1 [r exists zset]
--                r zremrangebyscore zset $min $max
--            }
--
--            # inner range
--            assert_equal 3 [remrangebyscore 2 4]
--            assert_equal {a e} [r zrange zset 0 -1]
--
--            # start underflow
--            assert_equal 1 [remrangebyscore -10 1]
--            assert_equal {b c d e} [r zrange zset 0 -1]
--
--            # end overflow
--            assert_equal 1 [remrangebyscore 5 10]
--            assert_equal {a b c d} [r zrange zset 0 -1]
--
--            # switch min and max
--            assert_equal 0 [remrangebyscore 4 2]
--            assert_equal {a b c d e} [r zrange zset 0 -1]
--
--            # -inf to mid
--            assert_equal 3 [remrangebyscore -inf 3]
--            assert_equal {d e} [r zrange zset 0 -1]
--
--            # mid to +inf
--            assert_equal 3 [remrangebyscore 3 +inf]
--            assert_equal {a b} [r zrange zset 0 -1]
--
--            # -inf to +inf
--            assert_equal 5 [remrangebyscore -inf +inf]
--            assert_equal {} [r zrange zset 0 -1]
--
--            # exclusive min
--            assert_equal 4 [remrangebyscore (1 5]
--            assert_equal {a} [r zrange zset 0 -1]
--            assert_equal 3 [remrangebyscore (2 5]
--            assert_equal {a b} [r zrange zset 0 -1]
--
--            # exclusive max
--            assert_equal 4 [remrangebyscore 1 (5]
--            assert_equal {e} [r zrange zset 0 -1]
--            assert_equal 3 [remrangebyscore 1 (4]
--            assert_equal {d e} [r zrange zset 0 -1]
--
--            # exclusive min and max
--            assert_equal 3 [remrangebyscore (1 (5]
--            assert_equal {a e} [r zrange zset 0 -1]
--
--            # destroy when empty
--            assert_equal 5 [remrangebyscore 1 5]
--            assert_equal 0 [r exists zset]
--        }
--
--        test "ZREMRANGEBYSCORE with non-value min or max" {
--            assert_error "*not*float*" {r zremrangebyscore fooz str 1}
--            assert_error "*not*float*" {r zremrangebyscore fooz 1 str}
--            assert_error "*not*float*" {r zremrangebyscore fooz 1 NaN}
--        }
-+        #     assert_equal 9 [r zlexcount zset - +]
-+        #     assert_equal 0 [r zlexcount zset + -]
-+        #     assert_equal 0 [r zlexcount zset + \[c]
-+        #     assert_equal 0 [r zlexcount zset \[c -]
-+        #     assert_equal 8 [r zlexcount zset \[bar +]
-+        #     assert_equal 5 [r zlexcount zset \[bar \[foo]
-+        #     assert_equal 4 [r zlexcount zset \[bar (foo]
-+        #     assert_equal 4 [r zlexcount zset (bar \[foo]
-+        #     assert_equal 3 [r zlexcount zset (bar (foo]
-+        #     assert_equal 5 [r zlexcount zset - (foo]
-+        #     assert_equal 1 [r zlexcount zset (maxstring +]
-+        # }
-+
-+        # test "ZRANGEBYSLEX with LIMIT" {
-+        #     create_default_lex_zset
-+        #     assert_equal {alpha bar} [r zrangebylex zset - \[cool LIMIT 0 2]
-+        #     assert_equal {bar cool} [r zrangebylex zset - \[cool LIMIT 1 2]
-+        #     assert_equal {} [r zrangebylex zset \[bar \[down LIMIT 0 0]
-+        #     assert_equal {} [r zrangebylex zset \[bar \[down LIMIT 2 0]
-+        #     assert_equal {bar} [r zrangebylex zset \[bar \[down LIMIT 0 1]
-+        #     assert_equal {cool} [r zrangebylex zset \[bar \[down LIMIT 1 1]
-+        #     assert_equal {bar cool down} [r zrangebylex zset \[bar \[down LIMIT 0 100]
-+        #     assert_equal {omega hill great foo elephant} [r zrevrangebylex zset + \[d LIMIT 0 5]
-+        #     assert_equal {omega hill great foo} [r zrevrangebylex zset + \[d LIMIT 0 4]
-+        # }
-+
-+        # test "ZRANGEBYLEX with invalid lex range specifiers" {
-+        #     assert_error "*not*string*" {r zrangebylex fooz foo bar}
-+        #     assert_error "*not*string*" {r zrangebylex fooz \[foo bar}
-+        #     assert_error "*not*string*" {r zrangebylex fooz foo \[bar}
-+        #     assert_error "*not*string*" {r zrangebylex fooz +x \[bar}
-+        #     assert_error "*not*string*" {r zrangebylex fooz -x \[bar}
-+        # }
-+
-+        # test "ZREMRANGEBYSCORE basics" {
-+        #     proc remrangebyscore {min max} {
-+        #         create_zset zset {1 a 2 b 3 c 4 d 5 e}
-+        #         assert_equal 1 [r exists zset]
-+        #         r zremrangebyscore zset $min $max
-+        #     }
-+
-+        #     # inner range
-+        #     assert_equal 3 [remrangebyscore 2 4]
-+        #     assert_equal {a e} [r zrange zset 0 -1]
-+
-+        #     # start underflow
-+        #     assert_equal 1 [remrangebyscore -10 1]
-+        #     assert_equal {b c d e} [r zrange zset 0 -1]
-+
-+        #     # end overflow
-+        #     assert_equal 1 [remrangebyscore 5 10]
-+        #     assert_equal {a b c d} [r zrange zset 0 -1]
-+
-+        #     # switch min and max
-+        #     assert_equal 0 [remrangebyscore 4 2]
-+        #     assert_equal {a b c d e} [r zrange zset 0 -1]
-+
-+        #     # -inf to mid
-+        #     assert_equal 3 [remrangebyscore -inf 3]
-+        #     assert_equal {d e} [r zrange zset 0 -1]
-+
-+        #     # mid to +inf
-+        #     assert_equal 3 [remrangebyscore 3 +inf]
-+        #     assert_equal {a b} [r zrange zset 0 -1]
-+
-+        #     # -inf to +inf
-+        #     assert_equal 5 [remrangebyscore -inf +inf]
-+        #     assert_equal {} [r zrange zset 0 -1]
-+
-+        #     # exclusive min
-+        #     assert_equal 4 [remrangebyscore (1 5]
-+        #     assert_equal {a} [r zrange zset 0 -1]
-+        #     assert_equal 3 [remrangebyscore (2 5]
-+        #     assert_equal {a b} [r zrange zset 0 -1]
-+
-+        #     # exclusive max
-+        #     assert_equal 4 [remrangebyscore 1 (5]
-+        #     assert_equal {e} [r zrange zset 0 -1]
-+        #     assert_equal 3 [remrangebyscore 1 (4]
-+        #     assert_equal {d e} [r zrange zset 0 -1]
-+
-+        #     # exclusive min and max
-+        #     assert_equal 3 [remrangebyscore (1 (5]
-+        #     assert_equal {a e} [r zrange zset 0 -1]
-+
-+        #     # destroy when empty
-+        #     assert_equal 5 [remrangebyscore 1 5]
-+        #     assert_equal 0 [r exists zset]
-+        # }
-+
-+        # test "ZREMRANGEBYSCORE with non-value min or max" {
-+        #     assert_error "*not*float*" {r zremrangebyscore fooz str 1}
-+        #     assert_error "*not*float*" {r zremrangebyscore fooz 1 str}
-+        #     assert_error "*not*float*" {r zremrangebyscore fooz 1 NaN}
-+        # }
- 
-         test "ZREMRANGEBYRANK basics" {
-             proc remrangebyrank {min max} {
-@@ -548,257 +548,257 @@ start_server {tags {"zset"}} {
-             assert_equal 0 [r exists zset]
-         }
- 
--        test "ZUNIONSTORE against non-existing key doesn't set destination - $encoding" {
--            r del zseta
--            assert_equal 0 [r zunionstore dst_key 1 zseta]
--            assert_equal 0 [r exists dst_key]
--        }
--
--        test "ZUNIONSTORE with empty set - $encoding" {
--            r del zseta zsetb
--            r zadd zseta 1 a
--            r zadd zseta 2 b
--            r zunionstore zsetc 2 zseta zsetb
--            r zrange zsetc 0 -1 withscores
--        } {a 1 b 2}
--
--        test "ZUNIONSTORE basics - $encoding" {
--            r del zseta zsetb zsetc
--            r zadd zseta 1 a
--            r zadd zseta 2 b
--            r zadd zseta 3 c
--            r zadd zsetb 1 b
--            r zadd zsetb 2 c
--            r zadd zsetb 3 d
--
--            assert_equal 4 [r zunionstore zsetc 2 zseta zsetb]
--            assert_equal {a 1 b 3 d 3 c 5} [r zrange zsetc 0 -1 withscores]
--        }
--
--        test "ZUNIONSTORE with weights - $encoding" {
--            assert_equal 4 [r zunionstore zsetc 2 zseta zsetb weights 2 3]
--            assert_equal {a 2 b 7 d 9 c 12} [r zrange zsetc 0 -1 withscores]
--        }
--
--        test "ZUNIONSTORE with a regular set and weights - $encoding" {
--            r del seta
--            r sadd seta a
--            r sadd seta b
--            r sadd seta c
--
--            assert_equal 4 [r zunionstore zsetc 2 seta zsetb weights 2 3]
--            assert_equal {a 2 b 5 c 8 d 9} [r zrange zsetc 0 -1 withscores]
--        }
--
--        test "ZUNIONSTORE with AGGREGATE MIN - $encoding" {
--            assert_equal 4 [r zunionstore zsetc 2 zseta zsetb aggregate min]
--            assert_equal {a 1 b 1 c 2 d 3} [r zrange zsetc 0 -1 withscores]
--        }
--
--        test "ZUNIONSTORE with AGGREGATE MAX - $encoding" {
--            assert_equal 4 [r zunionstore zsetc 2 zseta zsetb aggregate max]
--            assert_equal {a 1 b 2 c 3 d 3} [r zrange zsetc 0 -1 withscores]
--        }
--
--        test "ZINTERSTORE basics - $encoding" {
--            assert_equal 2 [r zinterstore zsetc 2 zseta zsetb]
--            assert_equal {b 3 c 5} [r zrange zsetc 0 -1 withscores]
--        }
--
--        test "ZINTERSTORE with weights - $encoding" {
--            assert_equal 2 [r zinterstore zsetc 2 zseta zsetb weights 2 3]
--            assert_equal {b 7 c 12} [r zrange zsetc 0 -1 withscores]
--        }
--
--        test "ZINTERSTORE with a regular set and weights - $encoding" {
--            r del seta
--            r sadd seta a
--            r sadd seta b
--            r sadd seta c
--            assert_equal 2 [r zinterstore zsetc 2 seta zsetb weights 2 3]
--            assert_equal {b 5 c 8} [r zrange zsetc 0 -1 withscores]
--        }
--
--        test "ZINTERSTORE with AGGREGATE MIN - $encoding" {
--            assert_equal 2 [r zinterstore zsetc 2 zseta zsetb aggregate min]
--            assert_equal {b 1 c 2} [r zrange zsetc 0 -1 withscores]
--        }
--
--        test "ZINTERSTORE with AGGREGATE MAX - $encoding" {
--            assert_equal 2 [r zinterstore zsetc 2 zseta zsetb aggregate max]
--            assert_equal {b 2 c 3} [r zrange zsetc 0 -1 withscores]
--        }
--
--        foreach cmd {ZUNIONSTORE ZINTERSTORE} {
--            test "$cmd with +inf/-inf scores - $encoding" {
--                r del zsetinf1 zsetinf2
--
--                r zadd zsetinf1 +inf key
--                r zadd zsetinf2 +inf key
--                r $cmd zsetinf3 2 zsetinf1 zsetinf2
--                assert_equal inf [r zscore zsetinf3 key]
--
--                r zadd zsetinf1 -inf key
--                r zadd zsetinf2 +inf key
--                r $cmd zsetinf3 2 zsetinf1 zsetinf2
--                assert_equal 0 [r zscore zsetinf3 key]
--
--                r zadd zsetinf1 +inf key
--                r zadd zsetinf2 -inf key
--                r $cmd zsetinf3 2 zsetinf1 zsetinf2
--                assert_equal 0 [r zscore zsetinf3 key]
--
--                r zadd zsetinf1 -inf key
--                r zadd zsetinf2 -inf key
--                r $cmd zsetinf3 2 zsetinf1 zsetinf2
--                assert_equal -inf [r zscore zsetinf3 key]
--            }
--
--            test "$cmd with NaN weights $encoding" {
--                r del zsetinf1 zsetinf2
--
--                r zadd zsetinf1 1.0 key
--                r zadd zsetinf2 1.0 key
--                assert_error "*weight*not*float*" {
--                    r $cmd zsetinf3 2 zsetinf1 zsetinf2 weights nan nan
--                }
--            }
--        }
--
--        test "Basic ZPOP with a single key - $encoding" {
--            r del zset
--            assert_equal {} [r zpopmin zset]
--            create_zset zset {-1 a 1 b 2 c 3 d 4 e}
--            assert_equal {a -1} [r zpopmin zset]
--            assert_equal {b 1} [r zpopmin zset]
--            assert_equal {e 4} [r zpopmax zset]
--            assert_equal {d 3} [r zpopmax zset]
--            assert_equal {c 2} [r zpopmin zset]
--            assert_equal 0 [r exists zset]
--            r set foo bar
--            assert_error "*WRONGTYPE*" {r zpopmin foo}
--        }
--
--        test "ZPOP with count - $encoding" {
--            r del z1 z2 z3 foo
--            r set foo bar
--            assert_equal {} [r zpopmin z1 2]
--            assert_error "*WRONGTYPE*" {r zpopmin foo 2}
--            create_zset z1 {0 a 1 b 2 c 3 d}
--            assert_equal {a 0 b 1} [r zpopmin z1 2]
--            assert_equal {d 3 c 2} [r zpopmax z1 2]
--        }
--
--        test "BZPOP with a single existing sorted set - $encoding" {
--            set rd [redis_deferring_client]
--            create_zset zset {0 a 1 b 2 c}
--
--            $rd bzpopmin zset 5
--            assert_equal {zset a 0} [$rd read]
--            $rd bzpopmin zset 5
--            assert_equal {zset b 1} [$rd read]
--            $rd bzpopmax zset 5
--            assert_equal {zset c 2} [$rd read]
--            assert_equal 0 [r exists zset]
--        }
--
--        test "BZPOP with multiple existing sorted sets - $encoding" {
--            set rd [redis_deferring_client]
--            create_zset z1 {0 a 1 b 2 c}
--            create_zset z2 {3 d 4 e 5 f}
--
--            $rd bzpopmin z1 z2 5
--            assert_equal {z1 a 0} [$rd read]
--            $rd bzpopmax z1 z2 5
--            assert_equal {z1 c 2} [$rd read]
--            assert_equal 1 [r zcard z1]
--            assert_equal 3 [r zcard z2]
--
--            $rd bzpopmax z2 z1 5
--            assert_equal {z2 f 5} [$rd read]
--            $rd bzpopmin z2 z1 5
--            assert_equal {z2 d 3} [$rd read]
--            assert_equal 1 [r zcard z1]
--            assert_equal 1 [r zcard z2]
--        }
--
--        test "BZPOP second sorted set has members - $encoding" {
--            set rd [redis_deferring_client]
--            r del z1
--            create_zset z2 {3 d 4 e 5 f}
--            $rd bzpopmax z1 z2 5
--            assert_equal {z2 f 5} [$rd read]
--            $rd bzpopmin z2 z1 5
--            assert_equal {z2 d 3} [$rd read]
--            assert_equal 0 [r zcard z1]
--            assert_equal 1 [r zcard z2]
--        }
--    }
--
--    basics ziplist
-+        # test "ZUNIONSTORE against non-existing key doesn't set destination - $encoding" {
-+        #     r del zseta
-+        #     assert_equal 0 [r zunionstore dst_key 1 zseta]
-+        #     assert_equal 0 [r exists dst_key]
-+        # }
-+
-+        # test "ZUNIONSTORE with empty set - $encoding" {
-+        #     r del zseta zsetb
-+        #     r zadd zseta 1 a
-+        #     r zadd zseta 2 b
-+        #     r zunionstore zsetc 2 zseta zsetb
-+        #     r zrange zsetc 0 -1 withscores
-+        # } {a 1 b 2}
-+
-+        # test "ZUNIONSTORE basics - $encoding" {
-+        #     r del zseta zsetb zsetc
-+        #     r zadd zseta 1 a
-+        #     r zadd zseta 2 b
-+        #     r zadd zseta 3 c
-+        #     r zadd zsetb 1 b
-+        #     r zadd zsetb 2 c
-+        #     r zadd zsetb 3 d
-+
-+        #     assert_equal 4 [r zunionstore zsetc 2 zseta zsetb]
-+        #     assert_equal {a 1 b 3 d 3 c 5} [r zrange zsetc 0 -1 withscores]
-+        # }
-+
-+        # test "ZUNIONSTORE with weights - $encoding" {
-+        #     assert_equal 4 [r zunionstore zsetc 2 zseta zsetb weights 2 3]
-+        #     assert_equal {a 2 b 7 d 9 c 12} [r zrange zsetc 0 -1 withscores]
-+        # }
-+
-+        # test "ZUNIONSTORE with a regular set and weights - $encoding" {
-+        #     r del seta
-+        #     r sadd seta a
-+        #     r sadd seta b
-+        #     r sadd seta c
-+
-+        #     assert_equal 4 [r zunionstore zsetc 2 seta zsetb weights 2 3]
-+        #     assert_equal {a 2 b 5 c 8 d 9} [r zrange zsetc 0 -1 withscores]
-+        # }
-+
-+        # test "ZUNIONSTORE with AGGREGATE MIN - $encoding" {
-+        #     assert_equal 4 [r zunionstore zsetc 2 zseta zsetb aggregate min]
-+        #     assert_equal {a 1 b 1 c 2 d 3} [r zrange zsetc 0 -1 withscores]
-+        # }
-+
-+        # test "ZUNIONSTORE with AGGREGATE MAX - $encoding" {
-+        #     assert_equal 4 [r zunionstore zsetc 2 zseta zsetb aggregate max]
-+        #     assert_equal {a 1 b 2 c 3 d 3} [r zrange zsetc 0 -1 withscores]
-+        # }
-+
-+        # test "ZINTERSTORE basics - $encoding" {
-+        #     assert_equal 2 [r zinterstore zsetc 2 zseta zsetb]
-+        #     assert_equal {b 3 c 5} [r zrange zsetc 0 -1 withscores]
-+        # }
-+
-+        # test "ZINTERSTORE with weights - $encoding" {
-+        #     assert_equal 2 [r zinterstore zsetc 2 zseta zsetb weights 2 3]
-+        #     assert_equal {b 7 c 12} [r zrange zsetc 0 -1 withscores]
-+        # }
-+
-+        # test "ZINTERSTORE with a regular set and weights - $encoding" {
-+        #     r del seta
-+        #     r sadd seta a
-+        #     r sadd seta b
-+        #     r sadd seta c
-+        #     assert_equal 2 [r zinterstore zsetc 2 seta zsetb weights 2 3]
-+        #     assert_equal {b 5 c 8} [r zrange zsetc 0 -1 withscores]
-+        # }
-+
-+        # test "ZINTERSTORE with AGGREGATE MIN - $encoding" {
-+        #     assert_equal 2 [r zinterstore zsetc 2 zseta zsetb aggregate min]
-+        #     assert_equal {b 1 c 2} [r zrange zsetc 0 -1 withscores]
-+        # }
-+
-+        # test "ZINTERSTORE with AGGREGATE MAX - $encoding" {
-+        #     assert_equal 2 [r zinterstore zsetc 2 zseta zsetb aggregate max]
-+        #     assert_equal {b 2 c 3} [r zrange zsetc 0 -1 withscores]
-+        # }
-+
-+        # foreach cmd {ZUNIONSTORE ZINTERSTORE} {
-+        #     test "$cmd with +inf/-inf scores - $encoding" {
-+        #         r del zsetinf1 zsetinf2
-+
-+        #         r zadd zsetinf1 +inf key
-+        #         r zadd zsetinf2 +inf key
-+        #         r $cmd zsetinf3 2 zsetinf1 zsetinf2
-+        #         assert_equal inf [r zscore zsetinf3 key]
-+
-+        #         r zadd zsetinf1 -inf key
-+        #         r zadd zsetinf2 +inf key
-+        #         r $cmd zsetinf3 2 zsetinf1 zsetinf2
-+        #         assert_equal 0 [r zscore zsetinf3 key]
-+
-+        #         r zadd zsetinf1 +inf key
-+        #         r zadd zsetinf2 -inf key
-+        #         r $cmd zsetinf3 2 zsetinf1 zsetinf2
-+        #         assert_equal 0 [r zscore zsetinf3 key]
-+
-+        #         r zadd zsetinf1 -inf key
-+        #         r zadd zsetinf2 -inf key
-+        #         r $cmd zsetinf3 2 zsetinf1 zsetinf2
-+        #         assert_equal -inf [r zscore zsetinf3 key]
-+        #     }
-+
-+        #     test "$cmd with NaN weights $encoding" {
-+        #         r del zsetinf1 zsetinf2
-+
-+        #         r zadd zsetinf1 1.0 key
-+        #         r zadd zsetinf2 1.0 key
-+        #         assert_error "*weight*not*float*" {
-+        #             r $cmd zsetinf3 2 zsetinf1 zsetinf2 weights nan nan
-+        #         }
-+        #     }
-+        # }
-+
-+    #     test "Basic ZPOP with a single key - $encoding" {
-+    #         r del zset
-+    #         assert_equal {} [r zpopmin zset]
-+    #         create_zset zset {-1 a 1 b 2 c 3 d 4 e}
-+    #         assert_equal {a -1} [r zpopmin zset]
-+    #         assert_equal {b 1} [r zpopmin zset]
-+    #         assert_equal {e 4} [r zpopmax zset]
-+    #         assert_equal {d 3} [r zpopmax zset]
-+    #         assert_equal {c 2} [r zpopmin zset]
-+    #         assert_equal 0 [r exists zset]
-+    #         r set foo bar
-+    #         assert_error "*WRONGTYPE*" {r zpopmin foo}
-+    #     }
-+
-+    #     test "ZPOP with count - $encoding" {
-+    #         r del z1 z2 z3 foo
-+    #         r set foo bar
-+    #         assert_equal {} [r zpopmin z1 2]
-+    #         assert_error "*WRONGTYPE*" {r zpopmin foo 2}
-+    #         create_zset z1 {0 a 1 b 2 c 3 d}
-+    #         assert_equal {a 0 b 1} [r zpopmin z1 2]
-+    #         assert_equal {d 3 c 2} [r zpopmax z1 2]
-+    #     }
-+
-+    #     test "BZPOP with a single existing sorted set - $encoding" {
-+    #         set rd [redis_deferring_client]
-+    #         create_zset zset {0 a 1 b 2 c}
-+
-+    #         $rd bzpopmin zset 5
-+    #         assert_equal {zset a 0} [$rd read]
-+    #         $rd bzpopmin zset 5
-+    #         assert_equal {zset b 1} [$rd read]
-+    #         $rd bzpopmax zset 5
-+    #         assert_equal {zset c 2} [$rd read]
-+    #         assert_equal 0 [r exists zset]
-+    #     }
-+
-+    #     test "BZPOP with multiple existing sorted sets - $encoding" {
-+    #         set rd [redis_deferring_client]
-+    #         create_zset z1 {0 a 1 b 2 c}
-+    #         create_zset z2 {3 d 4 e 5 f}
-+
-+    #         $rd bzpopmin z1 z2 5
-+    #         assert_equal {z1 a 0} [$rd read]
-+    #         $rd bzpopmax z1 z2 5
-+    #         assert_equal {z1 c 2} [$rd read]
-+    #         assert_equal 1 [r zcard z1]
-+    #         assert_equal 3 [r zcard z2]
-+
-+    #         $rd bzpopmax z2 z1 5
-+    #         assert_equal {z2 f 5} [$rd read]
-+    #         $rd bzpopmin z2 z1 5
-+    #         assert_equal {z2 d 3} [$rd read]
-+    #         assert_equal 1 [r zcard z1]
-+    #         assert_equal 1 [r zcard z2]
-+    #     }
-+
-+    #     test "BZPOP second sorted set has members - $encoding" {
-+    #         set rd [redis_deferring_client]
-+    #         r del z1
-+    #         create_zset z2 {3 d 4 e 5 f}
-+    #         $rd bzpopmax z1 z2 5
-+    #         assert_equal {z2 f 5} [$rd read]
-+    #         $rd bzpopmin z2 z1 5
-+    #         assert_equal {z2 d 3} [$rd read]
-+    #         assert_equal 0 [r zcard z1]
-+    #         assert_equal 1 [r zcard z2]
-+    #     }
-+    # }
-+
-+    # basics ziplist
-     basics skiplist
- 
--    test {ZINTERSTORE regression with two sets, intset+hashtable} {
--        r del seta setb setc
--        r sadd set1 a
--        r sadd set2 10
--        r zinterstore set3 2 set1 set2
--    } {0}
--
--    test {ZUNIONSTORE regression, should not create NaN in scores} {
--        r zadd z -inf neginf
--        r zunionstore out 1 z weights 0
--        r zrange out 0 -1 withscores
--    } {neginf 0}
--
--    test {ZINTERSTORE #516 regression, mixed sets and ziplist zsets} {
--        r sadd one 100 101 102 103
--        r sadd two 100 200 201 202
--        r zadd three 1 500 1 501 1 502 1 503 1 100
--        r zinterstore to_here 3 one two three WEIGHTS 0 0 1
--        r zrange to_here 0 -1
--    } {100}
--
--    test {ZUNIONSTORE result is sorted} {
--        # Create two sets with common and not common elements, perform
--        # the UNION, check that elements are still sorted.
--        r del one two dest
--        set cmd1 [list r zadd one]
--        set cmd2 [list r zadd two]
--        for {set j 0} {$j < 1000} {incr j} {
--            lappend cmd1 [expr rand()] [randomInt 1000]
--            lappend cmd2 [expr rand()] [randomInt 1000]
--        }
--        {*}$cmd1
--        {*}$cmd2
--        assert {[r zcard one] > 100}
--        assert {[r zcard two] > 100}
--        r zunionstore dest 2 one two
--        set oldscore 0
--        foreach {ele score} [r zrange dest 0 -1 withscores] {
--            assert {$score >= $oldscore}
--            set oldscore $score
--        }
--    }
-+    # test {ZINTERSTORE regression with two sets, intset+hashtable} {
-+    #     r del seta setb setc
-+    #     r sadd set1 a
-+    #     r sadd set2 10
-+    #     r zinterstore set3 2 set1 set2
-+    # } {0}
-+
-+    # test {ZUNIONSTORE regression, should not create NaN in scores} {
-+    #     r zadd z -inf neginf
-+    #     r zunionstore out 1 z weights 0
-+    #     r zrange out 0 -1 withscores
-+    # } {neginf 0}
-+
-+    # test {ZINTERSTORE #516 regression, mixed sets and ziplist zsets} {
-+    #     r sadd one 100 101 102 103
-+    #     r sadd two 100 200 201 202
-+    #     r zadd three 1 500 1 501 1 502 1 503 1 100
-+    #     r zinterstore to_here 3 one two three WEIGHTS 0 0 1
-+    #     r zrange to_here 0 -1
-+    # } {100}
-+
-+    # test {ZUNIONSTORE result is sorted} {
-+    #     # Create two sets with common and not common elements, perform
-+    #     # the UNION, check that elements are still sorted.
-+    #     r del one two dest
-+    #     set cmd1 [list r zadd one]
-+    #     set cmd2 [list r zadd two]
-+    #     for {set j 0} {$j < 1000} {incr j} {
-+    #         lappend cmd1 [expr rand()] [randomInt 1000]
-+    #         lappend cmd2 [expr rand()] [randomInt 1000]
-+    #     }
-+    #     {*}$cmd1
-+    #     {*}$cmd2
-+    #     assert {[r zcard one] > 100}
-+    #     assert {[r zcard two] > 100}
-+    #     r zunionstore dest 2 one two
-+    #     set oldscore 0
-+    #     foreach {ele score} [r zrange dest 0 -1 withscores] {
-+    #         assert {$score >= $oldscore}
-+    #         set oldscore $score
-+    #     }
-+    # }
- 
-     test "ZSET commands don't accept the empty strings as valid score" {
-         assert_error "*not*float*" {r zadd myzset "" abc}
-     }
- 
-     proc stressers {encoding} {
--        if {$encoding == "ziplist"} {
--            # Little extra to allow proper fuzzing in the sorting stresser
--            r config set zset-max-ziplist-entries 256
--            r config set zset-max-ziplist-value 64
--            set elements 128
--        } elseif {$encoding == "skiplist"} {
--            r config set zset-max-ziplist-entries 0
--            r config set zset-max-ziplist-value 0
--            if {$::accurate} {set elements 1000} else {set elements 100}
--        } else {
--            puts "Unknown sorted set encoding"
--            exit
--        }
-+        # if {$encoding == "ziplist"} {
-+        #     # Little extra to allow proper fuzzing in the sorting stresser
-+        #     r config set zset-max-ziplist-entries 256
-+        #     r config set zset-max-ziplist-value 64
-+        set elements 128
-+        # } elseif {$encoding == "skiplist"} {
-+        #     r config set zset-max-ziplist-entries 0
-+        #     r config set zset-max-ziplist-value 0
-+        #     if {$::accurate} {set elements 1000} else {set elements 100}
-+        # } else {
-+        #     puts "Unknown sorted set encoding"
-+        #     exit
-+        # }
- 
-         test "ZSCORE - $encoding" {
-             r del zscoretest
-@@ -809,9 +809,11 @@ start_server {tags {"zset"}} {
-                 r zadd zscoretest $score $i
-             }
- 
--            assert_encoding $encoding zscoretest
-+            # assert_encoding $encoding zscoretest
-             for {set i 0} {$i < $elements} {incr i} {
--                assert_equal [lindex $aux $i] [r zscore zscoretest $i]
-+                set expected [lindex $aux $i]
-+                set actual [r zscore zscoretest $i]
-+                assert {abs($expected - $actual) < 0.0000000000000001}
-             }
-         }
- 
-@@ -824,10 +826,12 @@ start_server {tags {"zset"}} {
-                 r zadd zscoretest $score $i
-             }
- 
--            r debug reload
--            assert_encoding $encoding zscoretest
-+            # r debug reload
-+            # assert_encoding $encoding zscoretest
-             for {set i 0} {$i < $elements} {incr i} {
--                assert_equal [lindex $aux $i] [r zscore zscoretest $i]
-+                 set expected [lindex $aux $i]
-+                 set actual [r zscore zscoretest $i]
-+                 assert {abs($expected - $actual) < 0.0000000000000001}
-             }
-         }
- 
-@@ -867,7 +871,7 @@ start_server {tags {"zset"}} {
-                     lappend auxlist [lindex $x 1]
-                 }
- 
--                assert_encoding $encoding myzset
-+                # assert_encoding $encoding myzset
-                 set fromredis [r zrange myzset 0 -1]
-                 set delta 0
-                 for {set i 0} {$i < [llength $fromredis]} {incr i} {
-@@ -886,7 +890,7 @@ start_server {tags {"zset"}} {
-                 r zadd zset [expr rand()] $i
-             }
- 
--            assert_encoding $encoding zset
-+        #     assert_encoding $encoding zset
-             for {set i 0} {$i < 100} {incr i} {
-                 set min [expr rand()]
-                 set max [expr rand()]
-@@ -961,128 +965,128 @@ start_server {tags {"zset"}} {
-             assert_equal {} $err
-         }
- 
--        test "ZRANGEBYLEX fuzzy test, 100 ranges in $elements element sorted set - $encoding" {
--            set lexset {}
--            r del zset
--            for {set j 0} {$j < $elements} {incr j} {
--                set e [randstring 0 30 alpha]
--                lappend lexset $e
--                r zadd zset 0 $e
--            }
--            set lexset [lsort -unique $lexset]
--            for {set j 0} {$j < 100} {incr j} {
--                set min [randstring 0 30 alpha]
--                set max [randstring 0 30 alpha]
--                set mininc [randomInt 2]
--                set maxinc [randomInt 2]
--                if {$mininc} {set cmin "\[$min"} else {set cmin "($min"}
--                if {$maxinc} {set cmax "\[$max"} else {set cmax "($max"}
--                set rev [randomInt 2]
--                if {$rev} {
--                    set cmd zrevrangebylex
--                } else {
--                    set cmd zrangebylex
--                }
--
--                # Make sure data is the same in both sides
--                assert {[r zrange zset 0 -1] eq $lexset}
--
--                # Get the Redis output
--                set output [r $cmd zset $cmin $cmax]
--                if {$rev} {
--                    set outlen [r zlexcount zset $cmax $cmin]
--                } else {
--                    set outlen [r zlexcount zset $cmin $cmax]
--                }
--
--                # Compute the same output via Tcl
--                set o {}
--                set copy $lexset
--                if {(!$rev && [string compare $min $max] > 0) ||
--                    ($rev && [string compare $max $min] > 0)} {
--                    # Empty output when ranges are inverted.
--                } else {
--                    if {$rev} {
--                        # Invert the Tcl array using Redis itself.
--                        set copy [r zrevrange zset 0 -1]
--                        # Invert min / max as well
--                        lassign [list $min $max $mininc $maxinc] \
--                            max min maxinc mininc
--                    }
--                    foreach e $copy {
--                        set mincmp [string compare $e $min]
--                        set maxcmp [string compare $e $max]
--                        if {
--                             ($mininc && $mincmp >= 0 || !$mininc && $mincmp > 0)
--                             &&
--                             ($maxinc && $maxcmp <= 0 || !$maxinc && $maxcmp < 0)
--                        } {
--                            lappend o $e
--                        }
--                    }
--                }
--                assert {$o eq $output}
--                assert {$outlen eq [llength $output]}
--            }
--        }
--
--        test "ZREMRANGEBYLEX fuzzy test, 100 ranges in $elements element sorted set - $encoding" {
--            set lexset {}
--            r del zset zsetcopy
--            for {set j 0} {$j < $elements} {incr j} {
--                set e [randstring 0 30 alpha]
--                lappend lexset $e
--                r zadd zset 0 $e
--            }
--            set lexset [lsort -unique $lexset]
--            for {set j 0} {$j < 100} {incr j} {
--                # Copy...
--                r zunionstore zsetcopy 1 zset
--                set lexsetcopy $lexset
--
--                set min [randstring 0 30 alpha]
--                set max [randstring 0 30 alpha]
--                set mininc [randomInt 2]
--                set maxinc [randomInt 2]
--                if {$mininc} {set cmin "\[$min"} else {set cmin "($min"}
--                if {$maxinc} {set cmax "\[$max"} else {set cmax "($max"}
--
--                # Make sure data is the same in both sides
--                assert {[r zrange zset 0 -1] eq $lexset}
--
--                # Get the range we are going to remove
--                set torem [r zrangebylex zset $cmin $cmax]
--                set toremlen [r zlexcount zset $cmin $cmax]
--                r zremrangebylex zsetcopy $cmin $cmax
--                set output [r zrange zsetcopy 0 -1]
--
--                # Remove the range with Tcl from the original list
--                if {$toremlen} {
--                    set first [lsearch -exact $lexsetcopy [lindex $torem 0]]
--                    set last [expr {$first+$toremlen-1}]
--                    set lexsetcopy [lreplace $lexsetcopy $first $last]
--                }
--                assert {$lexsetcopy eq $output}
--            }
--        }
--
--        test "ZSETs skiplist implementation backlink consistency test - $encoding" {
--            set diff 0
--            for {set j 0} {$j < $elements} {incr j} {
--                r zadd myzset [expr rand()] "Element-$j"
--                r zrem myzset "Element-[expr int(rand()*$elements)]"
--            }
--
--            assert_encoding $encoding myzset
--            set l1 [r zrange myzset 0 -1]
--            set l2 [r zrevrange myzset 0 -1]
--            for {set j 0} {$j < [llength $l1]} {incr j} {
--                if {[lindex $l1 $j] ne [lindex $l2 end-$j]} {
--                    incr diff
--                }
--            }
--            assert_equal 0 $diff
--        }
-+        # test "ZRANGEBYLEX fuzzy test, 100 ranges in $elements element sorted set - $encoding" {
-+        #     set lexset {}
-+        #     r del zset
-+        #     for {set j 0} {$j < $elements} {incr j} {
-+        #         set e [randstring 0 30 alpha]
-+        #         lappend lexset $e
-+        #         r zadd zset 0 $e
-+        #     }
-+        #     set lexset [lsort -unique $lexset]
-+        #     for {set j 0} {$j < 100} {incr j} {
-+        #         set min [randstring 0 30 alpha]
-+        #         set max [randstring 0 30 alpha]
-+        #         set mininc [randomInt 2]
-+        #         set maxinc [randomInt 2]
-+        #         if {$mininc} {set cmin "\[$min"} else {set cmin "($min"}
-+        #         if {$maxinc} {set cmax "\[$max"} else {set cmax "($max"}
-+        #         set rev [randomInt 2]
-+        #         if {$rev} {
-+        #             set cmd zrevrangebylex
-+        #         } else {
-+        #             set cmd zrangebylex
-+        #         }
-+
-+        #         # Make sure data is the same in both sides
-+        #         assert {[r zrange zset 0 -1] eq $lexset}
-+
-+        #         # Get the Redis output
-+        #         set output [r $cmd zset $cmin $cmax]
-+        #         if {$rev} {
-+        #             set outlen [r zlexcount zset $cmax $cmin]
-+        #         } else {
-+        #             set outlen [r zlexcount zset $cmin $cmax]
-+        #         }
-+
-+        #         # Compute the same output via Tcl
-+        #         set o {}
-+        #         set copy $lexset
-+        #         if {(!$rev && [string compare $min $max] > 0) ||
-+        #             ($rev && [string compare $max $min] > 0)} {
-+        #             # Empty output when ranges are inverted.
-+        #         } else {
-+        #             if {$rev} {
-+        #                 # Invert the Tcl array using Redis itself.
-+        #                 set copy [r zrevrange zset 0 -1]
-+        #                 # Invert min / max as well
-+        #                 lassign [list $min $max $mininc $maxinc] \
-+        #                     max min maxinc mininc
-+        #             }
-+        #             foreach e $copy {
-+        #                 set mincmp [string compare $e $min]
-+        #                 set maxcmp [string compare $e $max]
-+        #                 if {
-+        #                      ($mininc && $mincmp >= 0 || !$mininc && $mincmp > 0)
-+        #                      &&
-+        #                      ($maxinc && $maxcmp <= 0 || !$maxinc && $maxcmp < 0)
-+        #                 } {
-+        #                     lappend o $e
-+        #                 }
-+        #             }
-+        #         }
-+        #         assert {$o eq $output}
-+        #         assert {$outlen eq [llength $output]}
-+        #     }
-+        # }
-+
-+        # test "ZREMRANGEBYLEX fuzzy test, 100 ranges in $elements element sorted set - $encoding" {
-+        #     set lexset {}
-+        #     r del zset zsetcopy
-+        #     for {set j 0} {$j < $elements} {incr j} {
-+        #         set e [randstring 0 30 alpha]
-+        #         lappend lexset $e
-+        #         r zadd zset 0 $e
-+        #     }
-+        #     set lexset [lsort -unique $lexset]
-+        #     for {set j 0} {$j < 100} {incr j} {
-+        #         # Copy...
-+        #         r zunionstore zsetcopy 1 zset
-+        #         set lexsetcopy $lexset
-+
-+        #         set min [randstring 0 30 alpha]
-+        #         set max [randstring 0 30 alpha]
-+        #         set mininc [randomInt 2]
-+        #         set maxinc [randomInt 2]
-+        #         if {$mininc} {set cmin "\[$min"} else {set cmin "($min"}
-+        #         if {$maxinc} {set cmax "\[$max"} else {set cmax "($max"}
-+
-+        #         # Make sure data is the same in both sides
-+        #         assert {[r zrange zset 0 -1] eq $lexset}
-+
-+        #         # Get the range we are going to remove
-+        #         set torem [r zrangebylex zset $cmin $cmax]
-+        #         set toremlen [r zlexcount zset $cmin $cmax]
-+        #         r zremrangebylex zsetcopy $cmin $cmax
-+        #         set output [r zrange zsetcopy 0 -1]
-+
-+        #         # Remove the range with Tcl from the original list
-+        #         if {$toremlen} {
-+        #             set first [lsearch -exact $lexsetcopy [lindex $torem 0]]
-+        #             set last [expr {$first+$toremlen-1}]
-+        #             set lexsetcopy [lreplace $lexsetcopy $first $last]
-+        #         }
-+        #         assert {$lexsetcopy eq $output}
-+        #     }
-+        # }
-+
-+        # test "ZSETs skiplist implementation backlink consistency test - $encoding" {
-+        #     set diff 0
-+        #     for {set j 0} {$j < $elements} {incr j} {
-+        #         r zadd myzset [expr rand()] "Element-$j"
-+        #         r zrem myzset "Element-[expr int(rand()*$elements)]"
-+        #     }
-+
-+        #     # assert_encoding $encoding myzset
-+        #     set l1 [r zrange myzset 0 -1]
-+        #     set l2 [r zrevrange myzset 0 -1]
-+        #     for {set j 0} {$j < [llength $l1]} {incr j} {
-+        #         if {[lindex $l1 $j] ne [lindex $l2 end-$j]} {
-+        #             incr diff
-+        #         }
-+        #     }
-+        #     assert_equal 0 $diff
-+        # }
- 
-         test "ZSETs ZRANK augmented skip list stress testing - $encoding" {
-             set err {}
-@@ -1094,7 +1098,7 @@ start_server {tags {"zset"}} {
-                 } else {
-                     set score [expr rand()]
-                     r zadd myzset $score $i
--                    assert_encoding $encoding myzset
-+                    # assert_encoding $encoding myzset
-                 }
- 
-                 set card [r zcard myzset]
-@@ -1111,100 +1115,100 @@ start_server {tags {"zset"}} {
-             assert_equal {} $err
-         }
- 
--        test "BZPOPMIN, ZADD + DEL should not awake blocked client" {
--            set rd [redis_deferring_client]
--            r del zset
--
--            $rd bzpopmin zset 0
--            r multi
--            r zadd zset 0 foo
--            r del zset
--            r exec
--            r del zset
--            r zadd zset 1 bar
--            $rd read
--        } {zset bar 1}
--
--        test "BZPOPMIN, ZADD + DEL + SET should not awake blocked client" {
--            set rd [redis_deferring_client]
--            r del list
--
--            r del zset
--
--            $rd bzpopmin zset 0
--            r multi
--            r zadd zset 0 foo
--            r del zset
--            r set zset foo
--            r exec
--            r del zset
--            r zadd zset 1 bar
--            $rd read
--        } {zset bar 1}
--
--        test "BZPOPMIN with same key multiple times should work" {
--            set rd [redis_deferring_client]
--            r del z1 z2
--
--            # Data arriving after the BZPOPMIN.
--            $rd bzpopmin z1 z2 z2 z1 0
--            r zadd z1 0 a
--            assert_equal [$rd read] {z1 a 0}
--            $rd bzpopmin z1 z2 z2 z1 0
--            r zadd z2 1 b
--            assert_equal [$rd read] {z2 b 1}
--
--            # Data already there.
--            r zadd z1 0 a
--            r zadd z2 1 b
--            $rd bzpopmin z1 z2 z2 z1 0
--            assert_equal [$rd read] {z1 a 0}
--            $rd bzpopmin z1 z2 z2 z1 0
--            assert_equal [$rd read] {z2 b 1}
--        }
--
--        test "MULTI/EXEC is isolated from the point of view of BZPOPMIN" {
--            set rd [redis_deferring_client]
--            r del zset
--            $rd bzpopmin zset 0
--            r multi
--            r zadd zset 0 a
--            r zadd zset 1 b
--            r zadd zset 2 c
--            r exec
--            $rd read
--        } {zset a 0}
--
--        test "BZPOPMIN with variadic ZADD" {
--            set rd [redis_deferring_client]
--            r del zset
--            if {$::valgrind} {after 100}
--            $rd bzpopmin zset 0
--            if {$::valgrind} {after 100}
--            assert_equal 2 [r zadd zset -1 foo 1 bar]
--            if {$::valgrind} {after 100}
--            assert_equal {zset foo -1} [$rd read]
--            assert_equal {bar} [r zrange zset 0 -1]
--        }
--
--        test "BZPOPMIN with zero timeout should block indefinitely" {
--            set rd [redis_deferring_client]
--            r del zset
--            $rd bzpopmin zset 0
--            after 1000
--            r zadd zset 0 foo
--            assert_equal {zset foo 0} [$rd read]
--        }
-+        # test "BZPOPMIN, ZADD + DEL should not awake blocked client" {
-+        #     set rd [redis_deferring_client]
-+        #     r del zset
-+
-+        #     $rd bzpopmin zset 0
-+        #     r multi
-+        #     r zadd zset 0 foo
-+        #     r del zset
-+        #     r exec
-+        #     r del zset
-+        #     r zadd zset 1 bar
-+        #     $rd read
-+        # } {zset bar 1}
-+
-+        # test "BZPOPMIN, ZADD + DEL + SET should not awake blocked client" {
-+        #     set rd [redis_deferring_client]
-+        #     r del list
-+
-+        #     r del zset
-+
-+        #     $rd bzpopmin zset 0
-+        #     r multi
-+        #     r zadd zset 0 foo
-+        #     r del zset
-+        #     r set zset foo
-+        #     r exec
-+        #     r del zset
-+        #     r zadd zset 1 bar
-+        #     $rd read
-+        # } {zset bar 1}
-+
-+        # test "BZPOPMIN with same key multiple times should work" {
-+        #     set rd [redis_deferring_client]
-+        #     r del z1 z2
-+
-+        #     # Data arriving after the BZPOPMIN.
-+        #     $rd bzpopmin z1 z2 z2 z1 0
-+        #     r zadd z1 0 a
-+        #     assert_equal [$rd read] {z1 a 0}
-+        #     $rd bzpopmin z1 z2 z2 z1 0
-+        #     r zadd z2 1 b
-+        #     assert_equal [$rd read] {z2 b 1}
-+
-+        #     # Data already there.
-+        #     r zadd z1 0 a
-+        #     r zadd z2 1 b
-+        #     $rd bzpopmin z1 z2 z2 z1 0
-+        #     assert_equal [$rd read] {z1 a 0}
-+        #     $rd bzpopmin z1 z2 z2 z1 0
-+        #     assert_equal [$rd read] {z2 b 1}
-+        # }
-+
-+        # test "MULTI/EXEC is isolated from the point of view of BZPOPMIN" {
-+        #     set rd [redis_deferring_client]
-+        #     r del zset
-+        #     $rd bzpopmin zset 0
-+        #     r multi
-+        #     r zadd zset 0 a
-+        #     r zadd zset 1 b
-+        #     r zadd zset 2 c
-+        #     r exec
-+        #     $rd read
-+        # } {zset a 0}
-+
-+        # test "BZPOPMIN with variadic ZADD" {
-+        #     set rd [redis_deferring_client]
-+        #     r del zset
-+        #     if {$::valgrind} {after 100}
-+        #     $rd bzpopmin zset 0
-+        #     if {$::valgrind} {after 100}
-+        #     assert_equal 2 [r zadd zset -1 foo 1 bar]
-+        #     if {$::valgrind} {after 100}
-+        #     assert_equal {zset foo -1} [$rd read]
-+        #     assert_equal {bar} [r zrange zset 0 -1]
-+        # }
-+
-+        # test "BZPOPMIN with zero timeout should block indefinitely" {
-+        #     set rd [redis_deferring_client]
-+        #     r del zset
-+        #     $rd bzpopmin zset 0
-+        #     after 1000
-+        #     r zadd zset 0 foo
-+        #     assert_equal {zset foo 0} [$rd read]
-+        # }
-     }
- 
-     tags {"slow"} {
--        stressers ziplist
-+        # stressers ziplist
-         stressers skiplist
-     }
- 
-     test {ZSET skiplist order consistency when elements are moved} {
--        set original_max [lindex [r config get zset-max-ziplist-entries] 1]
--        r config set zset-max-ziplist-entries 0
-+        # set original_max [lindex [r config get zset-max-ziplist-entries] 1]
-+        # r config set zset-max-ziplist-entries 0
-         for {set times 0} {$times < 10} {incr times} {
-             r del zset
-             for {set j 0} {$j < 1000} {incr j} {
-@@ -1225,6 +1229,6 @@ start_server {tags {"zset"}} {
-                 set prev_score $score
-             }
-         }
--        r config set zset-max-ziplist-entries $original_max
-+        # r config set zset-max-ziplist-entries $original_max
-     }
- }
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index 9eac9f2..2cedecc 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -40,7 +40,7 @@ def dependentProjectNames = [
   ':geode-memcached',
   ':geode-old-client-support',
   ':geode-rebalancer',
-  ':geode-apis-compatible-with-redis',
+  ':geode-for-redis',
   ':geode-serialization',
   ':geode-tcp-server',
   ':geode-wan'
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index 1467ae7..7d1e817 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -981,7 +981,7 @@ lib/fastutil-core-8.5.4.jar
 lib/fastutil-extra-8.5.4.jar
 lib/findbugs-annotations-1.3.9-1.jar
 lib/geo-0.7.7.jar
-lib/geode-apis-compatible-with-redis-0.0.0.jar
+lib/geode-for-redis-0.0.0.jar
 lib/geode-common-0.0.0.jar
 lib/geode-connectors-0.0.0.jar
 lib/geode-core-0.0.0.jar
diff --git a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
index d8cb3c1..80e3a68 100644
--- a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
+++ b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
@@ -9,7 +9,7 @@ geode-lucene-0.0.0.jar
 geode-memcached-0.0.0.jar
 geode-old-client-support-0.0.0.jar
 geode-rebalancer-0.0.0.jar
-geode-apis-compatible-with-redis-0.0.0.jar
+geode-for-redis-0.0.0.jar
 geode-serialization-0.0.0.jar
 geode-tcp-server-0.0.0.jar
 geode-wan-0.0.0.jar
diff --git a/geode-book/master_middleman/source/subnavs/geode-subnav.erb b/geode-book/master_middleman/source/subnavs/geode-subnav.erb
index 7f261e1..37792ff 100644
--- a/geode-book/master_middleman/source/subnavs/geode-subnav.erb
+++ b/geode-book/master_middleman/source/subnavs/geode-subnav.erb
@@ -1431,25 +1431,25 @@ limitations under the License.
                         </ul>
                     </li>
                     <li class="has_submenu">
-                        <a href="/docs/guide/<%=vars.product_version_nodot%>/developing/geode_apis_compatible_with_redis.html"><%=vars.product_name%> APIs Compatible with Redis (Experimental)</a>
+                        <a href="/docs/guide/<%=vars.product_version_nodot%>/developing/geode_for_redis.html"><%=vars.product_name%> Geode for Redis (Experimental)</a>
                         <ul>
                             <li>
-                                <a href="/docs/guide/<%=vars.product_version_nodot%>/developing/geode_apis_compatible_with_redis.html#using-the-api">Using <%=vars.product_name%> APIs Compatible with Redis</a>
+                                <a href="/docs/guide/<%=vars.product_version_nodot%>/developing/geode_for_redis.html#using-the-api">Using <%=vars.product_name%> Geode for Redis</a>
                             </li>
                             <li>
-                                <a href="/docs/guide/<%=vars.product_version_nodot%>/developing/geode_apis_compatible_with_redis.html#supported-commands">Supported Redis Commands</a>
+                                <a href="/docs/guide/<%=vars.product_version_nodot%>/developing/geode_for_redis.html#supported-commands">Supported Redis Commands</a>
                             </li>
                             <li>
-                                <a href="/docs/guide/<%=vars.product_version_nodot%>/developing/geode_apis_compatible_with_redis.html#advantages-over-redis">Advantages of <%=vars.product_name%> over Redis</a>
+                                <a href="/docs/guide/<%=vars.product_version_nodot%>/developing/geode_for_redis.html#advantages-over-redis">Advantages of <%=vars.product_name%> over Redis</a>
                             </li>
                             <li>
-                                <a href="/docs/guide/<%=vars.product_version_nodot%>/developing/geode_apis_compatible_with_redis.html#expiration-accuracy">Expiration Accuracy</a>
+                                <a href="/docs/guide/<%=vars.product_version_nodot%>/developing/geode_for_redis.html#expiration-accuracy">Expiration Accuracy</a>
                             </li>
                              <li>
-                              <a href="/docs/guide/<%=vars.product_version_nodot%>/developing/geode_apis_compatible_with_redis.html#high-availability-model">High Availability Model</a>
+                              <a href="/docs/guide/<%=vars.product_version_nodot%>/developing/geode_for_redis.html#high-availability-model">High Availability Model</a>
                             </li>
                             <li>
-                              <a href="/docs/guide/<%=vars.product_version_nodot%>/developing/geode_apis_compatible_with_redis.html#loss-of-connections">Loss of Connections</a>
+                              <a href="/docs/guide/<%=vars.product_version_nodot%>/developing/geode_for_redis.html#loss-of-connections">Loss of Connections</a>
                             </li>
                         </ul>
                     </li>
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/ConfigurationProperties.java b/geode-core/src/main/java/org/apache/geode/distributed/ConfigurationProperties.java
index 5d76b9e..f1c1297 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/ConfigurationProperties.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/ConfigurationProperties.java
@@ -1921,10 +1921,10 @@ public interface ConfigurationProperties {
    */
   String OFF_HEAP_MEMORY_SIZE = "off-heap-memory-size";
   /**
-   * The static String definition of the <i>"compatible-with-redis-bind-address"</i> property <a
-   * name="compatible-with-redis-bind-address"/a>
+   * The static String definition of the <i>"geode-for-redis-bind-address"</i> property <a
+   * name="geode-for-redis-bind-address"/a>
    * </p>
-   * <U>Description</U>: Specifies the address on which Geode APIs compatible with Redis are
+   * <U>Description</U>: Specifies the address on which Geode for Redis is
    * listening. If set to the empty string or this property is not specified, the server listens on
    * all local addresses.
    * </p>
@@ -1935,28 +1935,28 @@ public interface ConfigurationProperties {
    * <p/>
    */
 
-  String REDIS_BIND_ADDRESS = "compatible-with-redis-bind-address";
+  String REDIS_BIND_ADDRESS = "geode-for-redis-bind-address";
   /**
-   * The static String definition of the <i>"compatible-with-redis-enabled"</i> property <a
-   * name="compatible-with-redis-enabled"/a>
+   * The static String definition of the <i>"geode-for-redis-enabled"</i> property <a
+   * name="geode-for-redis-enabled"/a>
    * </p>
-   * <U>Description</U>: When the default value of false, the Geode APIs compatible with Redis are
+   * <U>Description</U>: When the default value of false, Geode for Redis is
    * not available.
-   * Set to true to enable the Geode APIs compatible with Redis.</td>
+   * Set to true to enable Geode for Redis.</td>
    * </p>
    * <U>Default</U>: false
-   * When the default value of false, the Geode APIs compatible with Redis are not available.
-   * Set to true to enable the Geode APIs compatible with Redis.
+   * When the default value of false, Geode for Redis is not available.
+   * Set to true to enable Geode for Redis.
    * </p>
    *
    * <p>
    * Experimental: Geode API compatible with Redis is subject to change in future releases
    * <p/>
    */
-  String REDIS_ENABLED = "compatible-with-redis-enabled";
+  String REDIS_ENABLED = "geode-for-redis-enabled";
   /**
-   * The static String definition of the <i>"compatible-with-redis-username"</i> property <a
-   * name="compatible-with-redis-username"/a>
+   * The static String definition of the <i>"geode-for-redis-username"</i> property <a
+   * name="geode-for-redis-username"/a>
    * </p>
    * <U>Description</U>: Specifies the default username that the server uses when a client attempts
    * to authenticate using only a password. This requires a SecurityManager to be configured.
@@ -1967,13 +1967,13 @@ public interface ConfigurationProperties {
    * Experimental: Geode API compatible with Redis is subject to change in future releases
    * <p/>
    */
-  String REDIS_USERNAME = "compatible-with-redis-username";
+  String REDIS_USERNAME = "geode-for-redis-username";
   /**
-   * The static String definition of the <i>"compatible-with-redis-port"</i> property <a
-   * name="compatible-with-redis-port"/a>
+   * The static String definition of the <i>"geode-for-redis-port"</i> property <a
+   * name="geode-for-redis-port"/a>
    * </p>
    * <U>Description</U>: Specifies the port on which the server listens for connections from Geode
-   * APIs compatible with Redis. A value of 0 selects a random port.</td>
+   * Geode for Redis. A value of 0 selects a random port.</td>
    * </p>
    * <U>Default</U>: 6379
    * </p>
@@ -1983,7 +1983,7 @@ public interface ConfigurationProperties {
    * Experimental: Geode API compatible with Redis is subject to change in future releases
    * <p/>
    */
-  String REDIS_PORT = "compatible-with-redis-port";
+  String REDIS_PORT = "geode-for-redis-port";
   /**
    * The static String definition of the <i>"lock-memory"</i> property <a name="lock-memory"/a>
    * </p>
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/AbstractDistributionConfig.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/AbstractDistributionConfig.java
index 9129286..8d8680f 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/AbstractDistributionConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/AbstractDistributionConfig.java
@@ -674,7 +674,7 @@ public abstract class AbstractDistributionConfig extends AbstractConfig
     if (value != null && value.length() > 0 && !LocalHostUtil.isLocalHost(value)) {
       throw new IllegalArgumentException(
           String.format(
-              "The compatible-with-redis-bind-address %s is not a valid address for this machine.  These are the valid addresses for this machine: %s",
+              "The geode-for-redis-bind-address %s is not a valid address for this machine.  These are the valid addresses for this machine: %s",
               value, LocalHostUtil.getMyAddresses()));
     }
     return value;
diff --git a/geode-core/src/test/resources/org/apache/geode/management/internal/cli/commands/golden-help-offline.properties b/geode-core/src/test/resources/org/apache/geode/management/internal/cli/commands/golden-help-offline.properties
index e0e4b8a..fd7f1b0 100644
--- a/geode-core/src/test/resources/org/apache/geode/management/internal/cli/commands/golden-help-offline.properties
+++ b/geode-core/src/test/resources/org/apache/geode/management/internal/cli/commands/golden-help-offline.properties
@@ -2572,7 +2572,7 @@ SYNTAX\n\
 \ \ \ \ [--lock-memory(=value)?] [--log-level=value] [--max-connections=value] [--max-heap=value]\n\
 \ \ \ \ [--max-message-count=value] [--max-threads=value] [--mcast-address=value] [--mcast-port=value]\n\
 \ \ \ \ [--memcached-port=value] [--memcached-protocol=value] [--memcached-bind-address=value]\n\
-\ \ \ \ [--compatible-with-redis-port=value] [--compatible-with-redis-bind-address=value] [--compatible-with-redis-password=value]\n\
+\ \ \ \ [--geode-for-redis-port=value] [--geode-for-redis-bind-address=value] [--geode-for-redis-password=value]\n\
 \ \ \ \ [--message-time-to-live=value] [--off-heap-memory-size=value] [--properties-file=value]\n\
 \ \ \ \ [--rebalance(=value)?] [--security-properties-file=value] [--server-bind-address=value]\n\
 \ \ \ \ [--server-port=value] [--socket-buffer-size=value] [--spring-xml-location=value]\n\
@@ -2719,14 +2719,14 @@ PARAMETERS\n\
 \ \ \ \ \ \ \ \ Sets the IP address the Geode memcached service listens on for memcached clients. The\n\
 \ \ \ \ \ \ \ \ default is to bind to the first non-loopback address for this machine.\n\
 \ \ \ \ \ \ \ \ Required: false\n\
-\ \ \ \ compatible-with-redis-port\n\
-\ \ \ \ \ \ \ \ Sets the port that the Geode APIs compatible with Redis service listens on for Redis clients.\n\
+\ \ \ \ geode-for-redis-port\n\
+\ \ \ \ \ \ \ \ Sets the port that the Geode for Redis service listens on for Redis clients.\n\
 \ \ \ \ \ \ \ \ Required: false\n\
-\ \ \ \ compatible-with-redis-bind-address\n\
-\ \ \ \ \ \ \ \ Sets the IP address the Geode APIs compatible with Redis service listens on for Redis clients. The default is to\n\
+\ \ \ \ geode-for-redis-bind-address\n\
+\ \ \ \ \ \ \ \ Sets the IP address the Geode for Redis service listens on for Redis clients. The default is to\n\
 \ \ \ \ \ \ \ \ bind to the first non-loopback address for this machine.\n\
 \ \ \ \ \ \ \ \ Required: false\n\
-\ \ \ \ compatible-with-redis-password\n\
+\ \ \ \ geode-for-redis-password\n\
 \ \ \ \ \ \ \ \ Sets the authentication password for GeodeRedisServer\n\
 \ \ \ \ \ \ \ \ Required: false\n\
 \ \ \ \ message-time-to-live\n\
diff --git a/geode-docs/developing/book_intro.html.md.erb b/geode-docs/developing/book_intro.html.md.erb
index c021764..c04c1e5 100644
--- a/geode-docs/developing/book_intro.html.md.erb
+++ b/geode-docs/developing/book_intro.html.md.erb
@@ -70,9 +70,9 @@ For information about <%=vars.product_name%> REST application development, see [
     A function is a body of code that resides on a server and that an application can invoke from a client or from another server without the need to send the function code itself. The caller can direct a data-dependent function to operate on a particular dataset, or can direct a data-independent function to operate on a particular server, member, or member group.
 
 
--   **[<%=vars.product_name%> APIs compatible with Redis](geode_apis_compatible_with_redis.html)**
+-   **[<%=vars.product_name%> Geode for Redis](geode_for_redis.html)**
 
-    The <%=vars.product_name%> APIs compatible with Redis allow <%=vars.product_name%> to function
+    The <%=vars.product_name%> Geode for Redis allow <%=vars.product_name%> to function
     as a drop-in replacement for a Redis data store, letting Redis applications take advantage of
     <%=vars.product_name%>’s scaling capabilities without changing their client code. Redis clients
     connect to a <%=vars.product_name%> server in the same way they connect to a Redis server, using
diff --git a/geode-docs/developing/geode_apis_compatible_with_redis.html.md.erb b/geode-docs/developing/geode_apis_compatible_with_redis.html.md.erb
index e2fee90..b2b2f60 100644
--- a/geode-docs/developing/geode_apis_compatible_with_redis.html.md.erb
+++ b/geode-docs/developing/geode_apis_compatible_with_redis.html.md.erb
@@ -15,15 +15,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<% set_title(product_name, "APIs Compatible with Redis") %>
+<% set_title(product_name, "Geode for Redis") %>
 
-The <%=vars.product_name%> APIs compatible with Redis allow <%=vars.product_name%> to function as a drop-in replacement for a
+The <%=vars.product_name%> Geode for Redis allows <%=vars.product_name%> to function as a drop-in replacement for a
 highly-available Redis data store, letting Redis applications take advantage of
 <%=vars.product_name%>’s scaling capabilities without changing their client code. Redis clients connect to a <%=vars.product_name%>
 server in the same way they connect to a Redis server, using a hostname and a port number, with
 optional password authentication.
 
-<img src="../images_svg/geode_apis_compatible_with_redis.svg" class="image" />
+<img src="../images_svg/geode_for_redis.svg" class="image" />
 
 ## <a id="using-the-api" class="no-quick-link"></a>Using the <%=vars.product_name%> API compatible with Redis
 
@@ -35,38 +35,38 @@ Use gfsh to start at least one server with a command of the form:
 start server \
   --name=<serverName> \
   --locators=<locatorPort> \
-  --compatible-with-redis-port=<compatibleWithRedisPort> \
-  --compatible-with-redis-bind-address=<compatibleWithRedisBindAddress> \
-  --compatible-with-redis-password=<compatibleWithRedisPassword>
+  --geode-for-redis-port=<geodeForRedisPort> \
+  --geode-for-redis-bind-address=<geodeForRedisBindAddress> \
+  --geode-for-redis-password=<geodeForRedisPassword>
 ```
 
-If any of the options `compatible-with-redis-bind-address`, `compatible-with-redis-password`, or `compatible-with-redis-port`
-are included, a <%=vars.product_name%> server with APIs compatible with Redis will be started.
+If any of the options `geode-for-redis-bind-address`, `geode-for-redis-password`, or `geode-for-redis-port`
+are included, a <%=vars.product_name%> server with Geode for Redis will be started.
 
 Replace `<serverName>` with the name of your server.
 
 Replace `<locatorPort>` with your locator port.
 
-Replace `<compatibleWithRedisPort>` with the port that the <%=vars.product_name%> server
+Replace `<geodeForRedisPort>` with the port that the <%=vars.product_name%> server
  listens on for Redis commands. The typical port used with a cluster compatible with Redis is 6379.
 
-Replace `<compatibleWithRedisBindAddress>` with the address of the server host.
+Replace `<geodeForRedisBindAddress>` with the address of the server host.
 
-Replace `<compatibleWithWithRedisPassword>` with the password clients use to authenticate.
+Replace `<geodeForRedisPassword>` with the password clients use to authenticate.
 
 To confirm the server is listening, run:
 
 ``` pre
-redis-cli -h <compatibleWithRedisBindAddress> -p <compatibleWithRedisPort> -a <compatibleWithRedisPassword> ping
+redis-cli -h <geodeForRedisBindAddress> -p <geodeForRedisPort> -a <geodeForRedisPassword> ping
 ```
 
-Replace `<compatibleWithRedisBindAddress>`,`<compatibleWithRedisPort>`, and `<compatibleWithRedisPassword>` with the same values as the server.
+Replace `<geodeForRedisBindAddress>`,`<geodeForRedisPort>`, and `<geodeForRedisPassword>` with the same values as the server.
 
 If the server is functioning properly, you should see a response of `PONG`.
 
 ## <a id="supported-commands" class="no-quick-link"></a>Supported Redis Commands
 
-The <%=vars.product_name%> APIs compatible with Redis currently support the following Redis commands.
+The <%=vars.product_name%> Geode for Redis currently support the following Redis commands.
 <br/>
 
  - APPEND <br/>
@@ -131,7 +131,7 @@ Commands not listed above are **not implemented**.
 These commands are supported for Redis 5.
 
 **[1]** Redis accepts 64-bit signed integers for the HSCAN cursor and COUNT parameters.
- The Geode APIs compatible with Redis are limited to 32-bit integer values for these parameters.
+ Geode for Redis is limited to 32-bit integer values for these parameters.
 
 **[2]** INFO is implemented for the sections and fields listed below:
 
diff --git a/geode-docs/getting_started/intro_to_clients.html.md.erb b/geode-docs/getting_started/intro_to_clients.html.md.erb
index c553c9a..11a6e45 100644
--- a/geode-docs/getting_started/intro_to_clients.html.md.erb
+++ b/geode-docs/getting_started/intro_to_clients.html.md.erb
@@ -355,11 +355,11 @@ int main(int argc, char** argv) {
 - [Apache Geode Native C++ Client Documentation](https://geode.apache.org/docs/)
 - [Apache Geode Native Client C++ API Reference](https://geode.apache.org/releases/latest/cppdocs/hierarchy.html)
 
-## <a id="client-intro-redis"></a>Geode APIs Compatible with Redis
+## <a id="client-intro-redis"></a>Geode for Redis
 
-The <%=vars.product_name_long%> APIs compatible with Redis allow <%=vars.product_name_long%> to function as a drop-in replacement for a
+The <%=vars.product_name_long%> Geode for Redis allow <%=vars.product_name_long%> to function as a drop-in replacement for a
 highly-available Redis data store, letting Redis applications take advantage of
 <%=vars.product_name_long%>’s scaling capabilities without changing their client code.
 
 Note: This feature is experimental and is subject to change in future releases of <%=vars.product_name_long%>.
-See [Geode APIs compatible with Redis](../developing/geode_apis_compatible_with_redis.html) for current information regarding these APIs.
+See [Geode for Redis](../developing/geode_for_redis.html) for current information regarding these APIs.
diff --git a/geode-docs/reference/topics/gemfire_properties.html.md.erb b/geode-docs/reference/topics/gemfire_properties.html.md.erb
index bbdedf5..dd6973b 100644
--- a/geode-docs/reference/topics/gemfire_properties.html.md.erb
+++ b/geode-docs/reference/topics/gemfire_properties.html.md.erb
@@ -487,28 +487,28 @@ off-heap-memory-size=120g</code></pre></td>
 <td><em>not set</em></td>
 </tr>
 <tr>
-<td>compatible-with-redis-bind-address</td>
-<td>Specifies the address on which the <%=vars.product_name%> APIs compatible with Redis is listening. If set to the empty string or this property is not
+<td>geode-for-redis-bind-address</td>
+<td>Specifies the address on which the <%=vars.product_name%> Geode for Redis is listening. If set to the empty string or this property is not
 specified, the server listens on all local addresses.
 <td>S</td>
 <td><code>""</code></td>
 </tr>
 <tr>
-<td>compatible-with-redis-enabled</td>
-<td>When the default value of false, the <%=vars.product_name%> APIs compatible with Redis are not available.  Set
-to true to enable the <%=vars.product_name%> APIs compatible with Redis.</td>
+<td>geode-for-redis-enabled</td>
+<td>When the default value of false, the <%=vars.product_name%> Geode for Redis is not available.  Set
+to true to enable the <%=vars.product_name%> Geode for Redis.</td>
 <td>S</td>
 <td>false</td>
 </tr>
 <tr>
-<td>compatible-with-redis-password</td>
+<td>geode-for-redis-password</td>
 <td>Specifies the password that the server uses when a client attempts to authenticate.</td>
 <td>S</td>
 <td>no password set</td>
 </tr>
 <tr>
-<td>compatible-with-redis-port</td>
-<td>Specifies the port on which the server listens for <%=vars.product_name%> APIs compatible with Redis connections. A value of 0 selects a random port.</td>
+<td>geode-for-redis-port</td>
+<td>Specifies the port on which the server listens for <%=vars.product_name%> Geode for Redis connections. A value of 0 selects a random port.</td>
 <td>S</td>
 <td>6379</td>
 </tr>
diff --git a/geode-apis-compatible-with-redis/README.md b/geode-for-redis/README.md
similarity index 76%
rename from geode-apis-compatible-with-redis/README.md
rename to geode-for-redis/README.md
index 0fd9888..b50dbe1 100644
--- a/geode-apis-compatible-with-redis/README.md
+++ b/geode-for-redis/README.md
@@ -1,4 +1,4 @@
-# Apache Geode APIs Compatible with Redis
+# Apache Geode for Redis
 
 Note: This feature is experimental and is subject to change in future releases of Apache Geode.
 
@@ -11,7 +11,7 @@ Note: This feature is experimental and is subject to change in future releases o
 
 ## <a name="introduction"></a>Introduction
 
-The Geode APIs compatible with Redis allows Redis clients to use Geode as a highly-available Redis data store. Redis applications can take advantage of Geode’s scaling capabilities with minimal changes to the client code (Redis clients must be compatible with Redis CLUSTER commands).
+Geode for Redis allows Redis clients to use Geode as a highly-available Redis data store. Redis applications can take advantage of Geode’s scaling capabilities with minimal changes to the client code (Redis clients must be compatible with Redis CLUSTER commands).
 
 Redis clients connect to a Geode server in the same way they connect to a Redis server, using a hostname and a port number.
 
@@ -36,19 +36,19 @@ Once the locator has started, start at least one server with a command of the fo
 gfsh> start server \
   --name=<serverName> \
   --locators=localhost[<locatorPort>] \
-  --compatible-with-redis-port=<compatibleWithRedisPort> \
-  --compatible-with-redis-bind-address=<compatibleWithRedisBindAddress>
+  --geode-for-redis-port=<geodeForRedisPort> \
+  --geode-for-redis-bind-address=<geodeForRedisBindAddress>
 ```
 
-If any of the options `compatible-with-redis-bind-address`, `compatible-with-redis-username`, or `compatible-with-redis-port` are included, a Geode server with APIs compatible with Redis will be started.
+If any of the options `geode-for-redis-bind-address`, `geode-for-redis-username`, or `geode-for-redis-port` are included, a Geode server with Geode for Redis will be started.
 
 - Replace `<serverName>` with the name of your server.
 
 - Replace `<locatorPort>` with your locator port.
 
-- Replace `<compatibleWithRedisPort>` with the port that the Geode server listens on for Redis commands. The typical port used with a cluster compatible with Redis is 6379.
+- Replace `<geodeForRedisPort>` with the port that the Geode server listens on for Redis commands. The typical port used with a cluster compatible with Redis is 6379.
 
-- Replace `<compatibleWithRedisBindAddress>` with the address of the server host.
+- Replace `<geodeForRedisBindAddress>` with the address of the server host.
 
 Your Geode instance should now be up and running (1 locator and 1 server) and ready to accept Redis 
     commands.  
@@ -59,10 +59,10 @@ Your Geode instance should now be up and running (1 locator and 1 server) and re
 To confirm the server is listening, in a separate terminal run:
 
 ```console
-$> redis-cli -c -h <compatibleWithRedisBindAddress> -p <compatibleWithRedisPort> ping
+$> redis-cli -c -h <geodeForRedisBindAddress> -p <geodeForRedisPort> ping
 ```
 
-- Replace `<compatibleWithRedisBindAddress>`, `<compatibleWithRedisPort>`, and `<compatibleWithRedisPassword>` with the same values as the server.
+- Replace `<geodeForRedisBindAddress>`, `<geodeForRedisPort>`, and `<geodeForRedisPassword>` with the same values as the server.
 
 If the server is functioning properly, you should see a response of `PONG`.
 
@@ -72,7 +72,7 @@ make sure you change the `--name=` and `--redis-port=` parameters.
 
 For example:
 ```commandLine
-gfsh> start server --name=redisServer2 --locators=localhost[10334] --server-port=0 --compatible-with-redis-port=6380
+gfsh> start server --name=redisServer2 --locators=localhost[10334] --server-port=0 --geode-for-redis-port=6380
 ```
 
 ### <a name="shutting-down"></a>Shutting Down
@@ -99,7 +99,7 @@ not connected>
 
 Security is implemented slightly differently to OSS Redis. Redis stores password information in plain text in the redis.conf file.     
 
-When using Apache Geode, to enable security, a Security Manager needs to be configured on the server(s). This Security Manager will authenticate `AUTH <password>` commands and `AUTH <username> <password>` commands. Users can set a custom `default` username using the `geode-compatible-with-redis-username` parameter. This username will be used when `AUTH <password>` commands are sent without a `<username>`. 
+When using Apache Geode, to enable security, a Security Manager needs to be configured on the server(s). This Security Manager will authenticate `AUTH <password>` commands and `AUTH <username> <password>` commands. Users can set a custom `default` username using the `geode-for-redis-username` parameter. This username will be used when `AUTH <password>` commands are sent without a `<username>`. 
 
 The following gfsh command will configure a `SimpleSecurityManager`:
 
@@ -107,22 +107,22 @@ The following gfsh command will configure a `SimpleSecurityManager`:
 gfsh> start server \
   --name=<serverName> \
   --locators=<locatorPort> \
-  --compatible-with-redis-port=<compatibleWithRedisPort> \
-  --compatible-with-redis-bind-address=<compatibleWithRedisBindAddress> \
-  --compatible-with-redis-username=<compatibleWithRedisUsername> \
+  --geode-for-redis-port=<geodeForRedisPort> \
+  --geode-for-redis-bind-address=<geodeForRedisBindAddress> \
+  --geode-for-redis-username=<geodeForRedisUsername> \
   --J=-Dgemfire.security-manager=org.apache.geode.examples.SimpleSecurityManager
 ```
 
 To confirm that the server is working, in a separate terminal run:
 
 ```console
-$> redis-cli -c -h <compatibleWithRedisBindAddress> -p <compatibleWithRedisPort> \
-  --user <compatibleWithRedisUsername> -a <compatibleWithRedisUsername> ping
+$> redis-cli -c -h <geodeForRedisBindAddress> -p <geodeForRedisPort> \
+  --user <geodeForRedisUsername> -a <geodeForRedisUsername> ping
 ```
 
 The `SimpleSecurityManager` is only to be used **for demonstration purposes**. It will authenticate successfully when the `password` and `username` are the same.
 
-Note that the `compatible-with-redis-username` property is only needed if `AUTH` commands are issued without a username. In this case, the Security Manager will need to respond to authentication requests using this username.
+Note that the `geode-for-redis-username` property is only needed if `AUTH` commands are issued without a username. In this case, the Security Manager will need to respond to authentication requests using this username.
 
 Note also that _any_ `AUTH` requests will fail if no Security Manager has been configured.
 
@@ -143,7 +143,7 @@ This is a known solution for many Managed Redis products (ElastiCache, Azure Cac
 
 ## <a name="redis-commands"></a>Redis Commands
 
-The Geode APIs compatible with Redis implement a subset of the full Redis command set.
+Geode for Redis implements a subset of the full Redis command set.
 
 #### <a name="supported-redis-commands"></a> Supported Redis Commands [Return to top](#introduction)
 
@@ -234,7 +234,7 @@ The Geode APIs compatible with Redis implement a subset of the full Redis comman
 
 **NOTES:**
 
-<sup>1</sup>Redis accepts 64-bit signed integers for the HSCAN cursor and COUNT parameters. The Geode APIs compatible with Redis are limited to 32-bit integer values for these parameters.
+<sup>1</sup>Redis accepts 64-bit signed integers for the HSCAN cursor and COUNT parameters. Geode for Redis is limited to 32-bit integer values for these parameters.
 <br/>  
 <sup>2</sup> INFO is implemented for the sections and fields listed below:
 
diff --git a/geode-apis-compatible-with-redis/build.gradle b/geode-for-redis/build.gradle
similarity index 100%
rename from geode-apis-compatible-with-redis/build.gradle
rename to geode-for-redis/build.gradle
diff --git a/geode-apis-compatible-with-redis/gfsh.png b/geode-for-redis/gfsh.png
similarity index 100%
rename from geode-apis-compatible-with-redis/gfsh.png
rename to geode-for-redis/gfsh.png
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/CommandPipeliningNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/CommandPipeliningNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/CommandPipeliningNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/CommandPipeliningNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/GeodeRedisServerStartupDUnitTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/GeodeRedisServerStartupDUnitTest.java
similarity index 96%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/GeodeRedisServerStartupDUnitTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/GeodeRedisServerStartupDUnitTest.java
index 753dc51..2f7ecfe 100644
--- a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/GeodeRedisServerStartupDUnitTest.java
+++ b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/GeodeRedisServerStartupDUnitTest.java
@@ -91,7 +91,7 @@ public class GeodeRedisServerStartupDUnitTest {
         .withProperty(REDIS_PORT, "-1")
         .withProperty(REDIS_BIND_ADDRESS, "localhost")
         .withProperty(REDIS_ENABLED, "true"))).hasRootCauseMessage(
-            "Could not set \"compatible-with-redis-port\" to \"-1\" because its value can not be less than \"0\".");
+            "Could not set \"geode-for-redis-port\" to \"-1\" because its value can not be less than \"0\".");
   }
 
   @Test
@@ -119,7 +119,7 @@ public class GeodeRedisServerStartupDUnitTest {
         .withProperty(REDIS_BIND_ADDRESS, "1.1.1.1")
         .withProperty(REDIS_ENABLED, "true")))
             .hasStackTraceContaining(
-                "The compatible-with-redis-bind-address 1.1.1.1 is not a valid address for this machine");
+                "The geode-for-redis-bind-address 1.1.1.1 is not a valid address for this machine");
   }
 
   @Test
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/NativeRedisClusterTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/NativeRedisClusterTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/NativeRedisClusterTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/NativeRedisClusterTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/GeodeRedisServerStartUpAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/GeodeRedisServerStartUpAcceptanceTest.java
similarity index 90%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/GeodeRedisServerStartUpAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/GeodeRedisServerStartUpAcceptanceTest.java
index 385a5a7..75df18c 100644
--- a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/GeodeRedisServerStartUpAcceptanceTest.java
+++ b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/GeodeRedisServerStartUpAcceptanceTest.java
@@ -43,8 +43,8 @@ public class GeodeRedisServerStartUpAcceptanceTest {
         "start server",
         "--server-port", "0",
         "--name", "same-port-and-address-server",
-        "--compatible-with-redis-bind-address", "localhost",
-        "--compatible-with-redis-port", String.valueOf(port));
+        "--geode-for-redis-bind-address", "localhost",
+        "--geode-for-redis-port", String.valueOf(port));
     GfshExecution execution;
 
     try (Socket interferingSocket = new Socket()) {
@@ -66,7 +66,7 @@ public class GeodeRedisServerStartUpAcceptanceTest {
         "start server",
         "--server-port", "0",
         "--name", "same-port-all-addresses-server",
-        "--compatible-with-redis-port", String.valueOf(port));
+        "--geode-for-redis-port", String.valueOf(port));
     GfshExecution execution;
 
     try (Socket interferingSocket = new Socket()) {
@@ -86,7 +86,7 @@ public class GeodeRedisServerStartUpAcceptanceTest {
         "start server",
         "--server-port", "0",
         "--name", "invalid-bind-server",
-        "--compatible-with-redis-bind-address", "1.1.1.1");
+        "--geode-for-redis-bind-address", "1.1.1.1");
     GfshExecution execution;
 
     execution = GfshScript.of(startServerCommand)
@@ -94,6 +94,6 @@ public class GeodeRedisServerStartUpAcceptanceTest {
         .execute(gfshRule);
 
     assertThat(execution.getOutputText()).containsIgnoringCase(
-        "The compatible-with-redis-bind-address 1.1.1.1 is not a valid address for this machine");
+        "The geode-for-redis-bind-address 1.1.1.1 is not a valid address for this machine");
   }
 }
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/GlobPatternNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/GlobPatternNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/GlobPatternNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/GlobPatternNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/UnknownNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/UnknownNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/UnknownNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/UnknownNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/cluster/ClusterNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/cluster/ClusterNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/cluster/ClusterNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/cluster/ClusterNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/connection/AuthNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/connection/AuthNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/connection/AuthNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/connection/AuthNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/connection/EchoNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/connection/EchoNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/connection/EchoNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/connection/EchoNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/connection/PingNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/connection/PingNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/connection/PingNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/connection/PingNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/connection/SelectNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/connection/SelectNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/connection/SelectNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/connection/SelectNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/hash/HScanNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/hash/HScanNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/hash/HScanNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/hash/HScanNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/hash/HashesNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/hash/HashesNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/hash/HashesNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/hash/HashesNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/hash/HincrByFloatNativeRedisAccetanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/hash/HincrByFloatNativeRedisAccetanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/hash/HincrByFloatNativeRedisAccetanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/hash/HincrByFloatNativeRedisAccetanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/hash/MemoryOverheadNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/hash/MemoryOverheadNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/hash/MemoryOverheadNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/hash/MemoryOverheadNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/DelNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/DelNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/DelNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/DelNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/DumpRestoreNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/DumpRestoreNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/DumpRestoreNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/DumpRestoreNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/ExistsNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/ExistsNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/ExistsNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/ExistsNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/ExpireAtNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/ExpireAtNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/ExpireAtNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/ExpireAtNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/ExpireNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/ExpireNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/ExpireNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/ExpireNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/KeysNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/KeysNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/KeysNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/KeysNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/PExpireAtNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/PExpireAtNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/PExpireAtNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/PExpireAtNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/PTTLNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/PTTLNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/PTTLNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/PTTLNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/PersistNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/PersistNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/PersistNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/PersistNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/PexpireNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/PexpireNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/PexpireNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/PexpireNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/RenameNXNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/RenameNXNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/RenameNXNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/RenameNXNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/RenameNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/RenameNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/RenameNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/RenameNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/ScanNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/ScanNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/ScanNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/ScanNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/TTLNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/TTLNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/TTLNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/TTLNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/TypeNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/TypeNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/TypeNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/TypeNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/UnlinkNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/UnlinkNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/UnlinkNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/key/UnlinkNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/pubsub/LettucePubSubNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/pubsub/LettucePubSubNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/pubsub/LettucePubSubNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/pubsub/LettucePubSubNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/pubsub/NativeRedisSubCommandsIntegrationTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/pubsub/NativeRedisSubCommandsIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/pubsub/NativeRedisSubCommandsIntegrationTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/pubsub/NativeRedisSubCommandsIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/pubsub/PubSubNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/pubsub/PubSubNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/pubsub/PubSubNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/pubsub/PubSubNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/pubsub/SubscriptionsNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/pubsub/SubscriptionsNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/pubsub/SubscriptionsNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/pubsub/SubscriptionsNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/DBSizeNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/DBSizeNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/DBSizeNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/DBSizeNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/FlushAllNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/FlushAllNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/FlushAllNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/FlushAllNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/FlushDBNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/FlushDBNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/FlushDBNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/FlushDBNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/HitsMissesNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/HitsMissesNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/HitsMissesNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/HitsMissesNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/InfoNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/InfoNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/InfoNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/InfoNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/InfoStatsNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/InfoStatsNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/InfoStatsNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/InfoStatsNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/MemoryStatsNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/MemoryStatsNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/MemoryStatsNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/MemoryStatsNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/ShutDownNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/ShutDownNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/ShutDownNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/ShutDownNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/SlowlogNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/SlowlogNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/SlowlogNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/SlowlogNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/TimeNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/TimeNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/TimeNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/server/TimeNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SDiffNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SDiffNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SDiffNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SDiffNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SInterNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SInterNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SInterNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SInterNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SIsMemberNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SIsMemberNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SIsMemberNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SIsMemberNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SMoveNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SMoveNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SMoveNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SMoveNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SPopNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SPopNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SPopNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SPopNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SRemNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SRemNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SRemNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SRemNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SScanNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SScanNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SScanNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SScanNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SUnionNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SUnionNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SUnionNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SUnionNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SetsNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SetsNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SetsNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/set/SetsNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZAddNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZAddNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZAddNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZAddNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZCardNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZCardNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZCardNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZCardNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZCountNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZCountNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZCountNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZCountNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZIncrByNativeRedisIntegrationTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZIncrByNativeRedisIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZIncrByNativeRedisIntegrationTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZIncrByNativeRedisIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZInterStoreNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZInterStoreNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZInterStoreNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZInterStoreNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZLexCountNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZLexCountNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZLexCountNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZLexCountNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZPopMaxNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZPopMaxNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZPopMaxNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZPopMaxNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZPopMinNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZPopMinNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZPopMinNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZPopMinNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByLexNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByLexNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByLexNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByLexNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByScoreNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByScoreNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByScoreNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByScoreNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRankNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRankNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRankNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRankNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByLexNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByLexNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByLexNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByLexNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByRankNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByRankNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByRankNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByRankNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByScoreNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByScoreNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByScoreNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByScoreNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeByLexNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeByLexNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeByLexNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeByLexNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeByScoreNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeByScoreNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeByScoreNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeByScoreNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRankNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRankNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRankNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRankNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZScanNativeRedisIntegrationTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZScanNativeRedisIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZScanNativeRedisIntegrationTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZScanNativeRedisIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZScoreNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZScoreNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZScoreNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZScoreNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZUnionStoreNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZUnionStoreNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZUnionStoreNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/sortedset/ZUnionStoreNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/AppendMemoryNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/AppendMemoryNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/AppendMemoryNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/AppendMemoryNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/AppendNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/AppendNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/AppendNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/AppendNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/BitCountNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/BitCountNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/BitCountNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/BitCountNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/BitOpNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/BitOpNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/BitOpNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/BitOpNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/BitPosNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/BitPosNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/BitPosNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/BitPosNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/DecrByNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/DecrByNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/DecrByNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/DecrByNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/DecrNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/DecrNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/DecrNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/DecrNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/GetBitNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/GetBitNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/GetBitNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/GetBitNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/GetNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/GetNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/GetNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/GetNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/GetRangeNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/GetRangeNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/GetRangeNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/GetRangeNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/GetSetNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/GetSetNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/GetSetNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/GetSetNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/IncrByFloatNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/IncrByFloatNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/IncrByFloatNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/IncrByFloatNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/IncrByNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/IncrByNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/IncrByNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/IncrByNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/IncrNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/IncrNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/IncrNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/IncrNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/MGetNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/MGetNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/MGetNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/MGetNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/MSetNXNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/MSetNXNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/MSetNXNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/MSetNXNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/MSetNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/MSetNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/MSetNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/MSetNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/PSetEXNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/PSetEXNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/PSetEXNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/PSetEXNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/SetBitNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/SetBitNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/SetBitNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/SetBitNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/SetExNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/SetExNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/SetExNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/SetExNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/SetNXNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/SetNXNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/SetNXNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/SetNXNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/SetNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/SetNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/SetNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/SetNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/SetRangeNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/SetRangeNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/SetRangeNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/SetRangeNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/StringNativeRedisAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/StringNativeRedisAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/StringNativeRedisAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/string/StringNativeRedisAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/session/NativeRedisSessionAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/session/NativeRedisSessionAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/session/NativeRedisSessionAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/session/NativeRedisSessionAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/java/session/NativeRedisSessionExpirationAcceptanceTest.java b/geode-for-redis/src/acceptanceTest/java/session/NativeRedisSessionExpirationAcceptanceTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/java/session/NativeRedisSessionExpirationAcceptanceTest.java
rename to geode-for-redis/src/acceptanceTest/java/session/NativeRedisSessionExpirationAcceptanceTest.java
diff --git a/geode-apis-compatible-with-redis/src/acceptanceTest/resources/testcontainers.properties b/geode-for-redis/src/acceptanceTest/resources/testcontainers.properties
similarity index 100%
rename from geode-apis-compatible-with-redis/src/acceptanceTest/resources/testcontainers.properties
rename to geode-for-redis/src/acceptanceTest/resources/testcontainers.properties
diff --git a/geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/NativeRedisTestRule.java b/geode-for-redis/src/commonTest/java/org/apache/geode/NativeRedisTestRule.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/NativeRedisTestRule.java
rename to geode-for-redis/src/commonTest/java/org/apache/geode/NativeRedisTestRule.java
diff --git a/geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/ClusterNode.java b/geode-for-redis/src/commonTest/java/org/apache/geode/redis/ClusterNode.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/ClusterNode.java
rename to geode-for-redis/src/commonTest/java/org/apache/geode/redis/ClusterNode.java
diff --git a/geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/ClusterNodes.java b/geode-for-redis/src/commonTest/java/org/apache/geode/redis/ClusterNodes.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/ClusterNodes.java
rename to geode-for-redis/src/commonTest/java/org/apache/geode/redis/ClusterNodes.java
diff --git a/geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/ConcurrentLoopingThreads.java b/geode-for-redis/src/commonTest/java/org/apache/geode/redis/ConcurrentLoopingThreads.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/ConcurrentLoopingThreads.java
rename to geode-for-redis/src/commonTest/java/org/apache/geode/redis/ConcurrentLoopingThreads.java
diff --git a/geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/GeodeRedisServerRule.java b/geode-for-redis/src/commonTest/java/org/apache/geode/redis/GeodeRedisServerRule.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/GeodeRedisServerRule.java
rename to geode-for-redis/src/commonTest/java/org/apache/geode/redis/GeodeRedisServerRule.java
diff --git a/geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/NativeRedisClusterTestRule.java b/geode-for-redis/src/commonTest/java/org/apache/geode/redis/NativeRedisClusterTestRule.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/NativeRedisClusterTestRule.java
rename to geode-for-redis/src/commonTest/java/org/apache/geode/redis/NativeRedisClusterTestRule.java
diff --git a/geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/RedisIntegrationTest.java b/geode-for-redis/src/commonTest/java/org/apache/geode/redis/RedisIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/RedisIntegrationTest.java
rename to geode-for-redis/src/commonTest/java/org/apache/geode/redis/RedisIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/ClusterNodesResponseProcessor.java b/geode-for-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/ClusterNodesResponseProcessor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/ClusterNodesResponseProcessor.java
rename to geode-for-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/ClusterNodesResponseProcessor.java
diff --git a/geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/ClusterSlotsResponseProcessor.java b/geode-for-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/ClusterSlotsResponseProcessor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/ClusterSlotsResponseProcessor.java
rename to geode-for-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/ClusterSlotsResponseProcessor.java
diff --git a/geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/HostPort.java b/geode-for-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/HostPort.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/HostPort.java
rename to geode-for-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/HostPort.java
diff --git a/geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/MovedResponseHandler.java b/geode-for-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/MovedResponseHandler.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/MovedResponseHandler.java
rename to geode-for-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/MovedResponseHandler.java
diff --git a/geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/NoopRedisResponseProcessor.java b/geode-for-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/NoopRedisResponseProcessor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/NoopRedisResponseProcessor.java
rename to geode-for-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/NoopRedisResponseProcessor.java
diff --git a/geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/RedisProxy.java b/geode-for-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/RedisProxy.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/RedisProxy.java
rename to geode-for-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/RedisProxy.java
diff --git a/geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/RedisProxyInboundHandler.java b/geode-for-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/RedisProxyInboundHandler.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/RedisProxyInboundHandler.java
rename to geode-for-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/RedisProxyInboundHandler.java
diff --git a/geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/RedisProxyOutboundHandler.java b/geode-for-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/RedisProxyOutboundHandler.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/RedisProxyOutboundHandler.java
rename to geode-for-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/RedisProxyOutboundHandler.java
diff --git a/geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/RedisResponseProcessor.java b/geode-for-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/RedisResponseProcessor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/RedisResponseProcessor.java
rename to geode-for-redis/src/commonTest/java/org/apache/geode/redis/internal/proxy/RedisResponseProcessor.java
diff --git a/geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/internal/ssl/TestSSLServer.java b/geode-for-redis/src/commonTest/java/org/apache/geode/redis/internal/ssl/TestSSLServer.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/internal/ssl/TestSSLServer.java
rename to geode-for-redis/src/commonTest/java/org/apache/geode/redis/internal/ssl/TestSSLServer.java
diff --git a/geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/mocks/MockBinarySubscriber.java b/geode-for-redis/src/commonTest/java/org/apache/geode/redis/mocks/MockBinarySubscriber.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/mocks/MockBinarySubscriber.java
rename to geode-for-redis/src/commonTest/java/org/apache/geode/redis/mocks/MockBinarySubscriber.java
diff --git a/geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/mocks/MockSubscriber.java b/geode-for-redis/src/commonTest/java/org/apache/geode/redis/mocks/MockSubscriber.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/mocks/MockSubscriber.java
rename to geode-for-redis/src/commonTest/java/org/apache/geode/redis/mocks/MockSubscriber.java
diff --git a/geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/test/dunit/rules/RedisClusterStartupRule.java b/geode-for-redis/src/commonTest/java/org/apache/geode/test/dunit/rules/RedisClusterStartupRule.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/test/dunit/rules/RedisClusterStartupRule.java
rename to geode-for-redis/src/commonTest/java/org/apache/geode/test/dunit/rules/RedisClusterStartupRule.java
diff --git a/geode-apis-compatible-with-redis/src/commonTest/resources/redis-cluster-compose.yml b/geode-for-redis/src/commonTest/resources/redis-cluster-compose.yml
similarity index 100%
rename from geode-apis-compatible-with-redis/src/commonTest/resources/redis-cluster-compose.yml
rename to geode-for-redis/src/commonTest/resources/redis-cluster-compose.yml
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/CheckPrimaryBucketFunction.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/CheckPrimaryBucketFunction.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/CheckPrimaryBucketFunction.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/CheckPrimaryBucketFunction.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/EnsurePrimaryStaysPutDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/EnsurePrimaryStaysPutDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/EnsurePrimaryStaysPutDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/EnsurePrimaryStaysPutDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/OutOfMemoryDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/OutOfMemoryDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/OutOfMemoryDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/OutOfMemoryDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/RedisDistDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/RedisDistDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/RedisDistDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/RedisDistDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/SSLDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/SSLDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/SSLDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/SSLDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/cluster/RedisPartitionResolverDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/cluster/RedisPartitionResolverDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/cluster/RedisPartitionResolverDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/cluster/RedisPartitionResolverDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/data/DeltaDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/data/DeltaDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/data/DeltaDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/data/DeltaDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/data/PartitionedRegionStatsUpdateTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/data/PartitionedRegionStatsUpdateTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/data/PartitionedRegionStatsUpdateTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/data/PartitionedRegionStatsUpdateTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/FlushAllDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/FlushAllDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/FlushAllDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/FlushAllDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/MovedDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/MovedDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/MovedDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/MovedDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/cluster/ClusterSlotsAndNodesDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/cluster/ClusterSlotsAndNodesDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/cluster/ClusterSlotsAndNodesDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/cluster/ClusterSlotsAndNodesDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/cluster/JedisAndLettuceClusterDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/cluster/JedisAndLettuceClusterDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/cluster/JedisAndLettuceClusterDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/cluster/JedisAndLettuceClusterDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HExistsDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HExistsDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HExistsDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HExistsDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HGetDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HGetDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HGetDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HGetDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HKeysDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HKeysDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HKeysDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HKeysDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HMgetDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HMgetDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HMgetDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HMgetDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HMsetDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HMsetDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HMsetDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HMsetDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HScanDunitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HScanDunitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HScanDunitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HScanDunitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HSetNXDunitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HSetNXDunitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HSetNXDunitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HSetNXDunitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HashesAndCrashesDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HashesAndCrashesDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HashesAndCrashesDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HashesAndCrashesDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HdelDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HdelDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HdelDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HdelDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HlenDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HlenDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HlenDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HlenDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HsetDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HsetDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HsetDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HsetDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HstrlenDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HstrlenDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HstrlenDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HstrlenDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HvalsDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HvalsDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HvalsDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/HvalsDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/key/ExpireDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/key/ExpireDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/key/ExpireDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/key/ExpireDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/key/PersistDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/key/PersistDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/key/PersistDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/key/PersistDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/key/RenameDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/key/RenameDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/key/RenameDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/key/RenameDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/pubsub/PubSubDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/pubsub/PubSubDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/pubsub/PubSubDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/pubsub/PubSubDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/set/SaddDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/set/SaddDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/set/SaddDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/set/SaddDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/set/SremDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/set/SremDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/set/SremDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/set/SremDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/sortedset/ZAddDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/sortedset/ZAddDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/sortedset/ZAddDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/sortedset/ZAddDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/sortedset/ZAddIncrOptionDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/sortedset/ZAddIncrOptionDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/sortedset/ZAddIncrOptionDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/sortedset/ZAddIncrOptionDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByLexDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByLexDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByLexDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByLexDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByRankDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByRankDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByRankDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByRankDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByScoreDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByScoreDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByScoreDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByScoreDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/string/MSetDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/string/MSetDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/string/MSetDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/string/MSetDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/string/MSetNXDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/string/MSetNXDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/string/MSetNXDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/string/MSetNXDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/string/StringsDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/string/StringsDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/string/StringsDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/string/StringsDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/session/RedisSessionDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/session/RedisSessionDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/session/RedisSessionDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/session/RedisSessionDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/session/SessionDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/session/SessionDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/session/SessionDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/session/SessionDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/session/SessionExpirationDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/session/SessionExpirationDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/session/SessionExpirationDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/session/SessionExpirationDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/session/SessionsAndCrashesDUnitTest.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/session/SessionsAndCrashesDUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/session/SessionsAndCrashesDUnitTest.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/session/SessionsAndCrashesDUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/session/springRedisTestApplication/RedisSpringTestApplication.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/session/springRedisTestApplication/RedisSpringTestApplication.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/session/springRedisTestApplication/RedisSpringTestApplication.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/session/springRedisTestApplication/RedisSpringTestApplication.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/session/springRedisTestApplication/SessionController.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/session/springRedisTestApplication/SessionController.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/session/springRedisTestApplication/SessionController.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/session/springRedisTestApplication/SessionController.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/session/springRedisTestApplication/config/SessionListener.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/session/springRedisTestApplication/config/SessionListener.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/session/springRedisTestApplication/config/SessionListener.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/session/springRedisTestApplication/config/SessionListener.java
diff --git a/geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/session/springRedisTestApplication/config/WebMvcConfig.java b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/session/springRedisTestApplication/config/WebMvcConfig.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/session/springRedisTestApplication/config/WebMvcConfig.java
rename to geode-for-redis/src/distributedTest/java/org/apache/geode/redis/session/springRedisTestApplication/config/WebMvcConfig.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeRedisSerializablesIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeRedisSerializablesIntegrationTest.java
similarity index 96%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeRedisSerializablesIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeRedisSerializablesIntegrationTest.java
index 7c89c5b..c896142 100755
--- a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeRedisSerializablesIntegrationTest.java
+++ b/geode-for-redis/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeRedisSerializablesIntegrationTest.java
@@ -26,7 +26,7 @@ public class AnalyzeRedisSerializablesIntegrationTest extends AnalyzeSerializabl
 
   @Override
   protected String getModuleName() {
-    return "geode-apis-compatible-with-redis";
+    return "geode-for-redis";
   }
 
   @Override
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/AbstractCommandPipeliningIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/AbstractCommandPipeliningIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/AbstractCommandPipeliningIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/AbstractCommandPipeliningIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/CommandPipeliningIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/CommandPipeliningIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/CommandPipeliningIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/CommandPipeliningIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/RedisCommandArgumentsTestHelper.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/RedisCommandArgumentsTestHelper.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/RedisCommandArgumentsTestHelper.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/RedisCommandArgumentsTestHelper.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/RedisTestHelper.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/RedisTestHelper.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/RedisTestHelper.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/RedisTestHelper.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/GeodeServerRunTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/GeodeServerRunTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/GeodeServerRunTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/GeodeServerRunTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/AbstractGlobPatternIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/AbstractGlobPatternIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/AbstractGlobPatternIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/AbstractGlobPatternIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/AbstractUnknownIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/AbstractUnknownIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/AbstractUnknownIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/AbstractUnknownIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/GlobPatternIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/GlobPatternIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/GlobPatternIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/GlobPatternIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/UnknownIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/UnknownIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/UnknownIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/UnknownIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/cluster/AbstractClusterIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/cluster/AbstractClusterIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/cluster/AbstractClusterIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/cluster/AbstractClusterIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/cluster/ClusterIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/cluster/ClusterIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/cluster/ClusterIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/cluster/ClusterIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/common/UnsupportedCommandsIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/common/UnsupportedCommandsIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/common/UnsupportedCommandsIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/common/UnsupportedCommandsIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/AbstractAuthIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/AbstractAuthIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/AbstractAuthIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/AbstractAuthIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/AbstractEchoIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/AbstractEchoIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/AbstractEchoIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/AbstractEchoIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/AbstractPingIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/AbstractPingIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/AbstractPingIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/AbstractPingIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/AbstractSelectIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/AbstractSelectIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/AbstractSelectIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/AbstractSelectIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/AuthIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/AuthIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/AuthIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/AuthIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/EchoIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/EchoIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/EchoIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/EchoIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/PingIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/PingIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/PingIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/PingIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/QuitIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/QuitIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/QuitIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/QuitIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/SelectIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/SelectIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/SelectIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/connection/SelectIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/hash/AbstractHScanIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/hash/AbstractHScanIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/hash/AbstractHScanIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/hash/AbstractHScanIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/hash/AbstractHashesIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/hash/AbstractHashesIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/hash/AbstractHashesIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/hash/AbstractHashesIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/hash/AbstractHincrByFloatIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/hash/AbstractHincrByFloatIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/hash/AbstractHincrByFloatIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/hash/AbstractHincrByFloatIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/hash/AbstractMemoryOverheadIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/hash/AbstractMemoryOverheadIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/hash/AbstractMemoryOverheadIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/hash/AbstractMemoryOverheadIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/hash/HScanIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/hash/HScanIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/hash/HScanIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/hash/HScanIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/hash/HashesIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/hash/HashesIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/hash/HashesIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/hash/HashesIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/hash/HincrByFloatIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/hash/HincrByFloatIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/hash/HincrByFloatIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/hash/HincrByFloatIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/hash/MemoryOverheadIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/hash/MemoryOverheadIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/hash/MemoryOverheadIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/hash/MemoryOverheadIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractDelIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractDelIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractDelIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractDelIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractDumpRestoreIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractDumpRestoreIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractDumpRestoreIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractDumpRestoreIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractExistsIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractExistsIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractExistsIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractExistsIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractExpireAtIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractExpireAtIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractExpireAtIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractExpireAtIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractExpireIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractExpireIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractExpireIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractExpireIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractKeysIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractKeysIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractKeysIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractKeysIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractPExpireAtIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractPExpireAtIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractPExpireAtIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractPExpireAtIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractPTTLIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractPTTLIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractPTTLIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractPTTLIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractPersistIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractPersistIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractPersistIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractPersistIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractPexpireIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractPexpireIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractPexpireIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractPexpireIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractRenameIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractRenameIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractRenameIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractRenameIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractRenameNXIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractRenameNXIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractRenameNXIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractRenameNXIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractScanIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractScanIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractScanIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractScanIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractTTLIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractTTLIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractTTLIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractTTLIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractTypeIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractTypeIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractTypeIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractTypeIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractUnlinkIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractUnlinkIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractUnlinkIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/AbstractUnlinkIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/DelIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/DelIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/DelIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/DelIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/DumpRestoreIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/DumpRestoreIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/DumpRestoreIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/DumpRestoreIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/ExistsIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/ExistsIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/ExistsIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/ExistsIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/ExpireAtIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/ExpireAtIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/ExpireAtIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/ExpireAtIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/ExpireIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/ExpireIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/ExpireIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/ExpireIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/KeysIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/KeysIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/KeysIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/KeysIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/PExpireAtIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/PExpireAtIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/PExpireAtIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/PExpireAtIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/PTTLIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/PTTLIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/PTTLIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/PTTLIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/PersistIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/PersistIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/PersistIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/PersistIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/PexpireIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/PexpireIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/PexpireIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/PexpireIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/RenameIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/RenameIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/RenameIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/RenameIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/RenameNXIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/RenameNXIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/RenameNXIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/RenameNXIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/ScanIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/ScanIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/ScanIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/ScanIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/TTLIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/TTLIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/TTLIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/TTLIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/TypeIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/TypeIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/TypeIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/TypeIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/UnlinkIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/UnlinkIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/UnlinkIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/key/UnlinkIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/AbstractLettucePubSubIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/AbstractLettucePubSubIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/AbstractLettucePubSubIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/AbstractLettucePubSubIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/AbstractPubSubIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/AbstractPubSubIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/AbstractPubSubIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/AbstractPubSubIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/AbstractSubCommandsIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/AbstractSubCommandsIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/AbstractSubCommandsIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/AbstractSubCommandsIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/AbstractSubscriptionsIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/AbstractSubscriptionsIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/AbstractSubscriptionsIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/AbstractSubscriptionsIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/LettucePubSubIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/LettucePubSubIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/LettucePubSubIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/LettucePubSubIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/PubSubIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/PubSubIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/PubSubIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/PubSubIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/SubCommandsIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/SubCommandsIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/SubCommandsIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/SubCommandsIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/SubscriptionsIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/SubscriptionsIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/SubscriptionsIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/SubscriptionsIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractDBSizeIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractDBSizeIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractDBSizeIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractDBSizeIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractFlushAllIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractFlushAllIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractFlushAllIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractFlushAllIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractFlushDBIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractFlushDBIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractFlushDBIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractFlushDBIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractHitsMissesIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractHitsMissesIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractHitsMissesIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractHitsMissesIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractInfoIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractInfoIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractInfoIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractInfoIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractRedisInfoStatsIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractRedisInfoStatsIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractRedisInfoStatsIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractRedisInfoStatsIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractRedisMemoryStatsIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractRedisMemoryStatsIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractRedisMemoryStatsIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractRedisMemoryStatsIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractShutDownIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractShutDownIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractShutDownIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractShutDownIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractSlowlogIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractSlowlogIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractSlowlogIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractSlowlogIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractTimeIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractTimeIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractTimeIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractTimeIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/CommandIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/CommandIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/CommandIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/CommandIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/DBSizeIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/DBSizeIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/DBSizeIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/DBSizeIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/FlushAllIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/FlushAllIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/FlushAllIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/FlushAllIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/FlushDBIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/FlushDBIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/FlushDBIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/FlushDBIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/HitsMissesIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/HitsMissesIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/HitsMissesIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/HitsMissesIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/InfoIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/InfoIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/InfoIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/InfoIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/InfoStatsIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/InfoStatsIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/InfoStatsIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/InfoStatsIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/LolWutIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/LolWutIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/LolWutIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/LolWutIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/MemoryStatsIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/MemoryStatsIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/MemoryStatsIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/MemoryStatsIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/ShutdownIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/ShutdownIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/ShutdownIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/ShutdownIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/SlowlogIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/SlowlogIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/SlowlogIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/SlowlogIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/TimeIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/TimeIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/TimeIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/TimeIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSDiffIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSDiffIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSDiffIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSDiffIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSInterIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSInterIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSInterIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSInterIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSIsMemberIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSIsMemberIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSIsMemberIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSIsMemberIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSMoveIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSMoveIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSMoveIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSMoveIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSPopIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSPopIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSPopIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSPopIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSRemIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSRemIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSRemIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSRemIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSScanIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSScanIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSScanIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSScanIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSUnionIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSUnionIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSUnionIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSUnionIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSetsIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSetsIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSetsIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/AbstractSetsIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SDiffIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SDiffIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SDiffIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SDiffIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SInterIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SInterIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SInterIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SInterIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SIsMemberIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SIsMemberIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SIsMemberIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SIsMemberIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SMoveIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SMoveIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SMoveIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SMoveIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SPopIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SPopIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SPopIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SPopIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SRemIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SRemIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SRemIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SRemIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SScanIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SScanIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SScanIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SScanIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SUnionIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SUnionIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SUnionIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SUnionIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SetsIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SetsIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SetsIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/set/SetsIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZAddIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZAddIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZAddIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZAddIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZCardIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZCardIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZCardIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZCardIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZCountIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZCountIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZCountIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZCountIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZIncrByIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZIncrByIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZIncrByIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZIncrByIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZInterStoreIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZInterStoreIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZInterStoreIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZInterStoreIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZLexCountIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZLexCountIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZLexCountIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZLexCountIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZPopMaxIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZPopMaxIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZPopMaxIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZPopMaxIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZPopMinIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZPopMinIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZPopMinIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZPopMinIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRangeByLexIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRangeByLexIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRangeByLexIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRangeByLexIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRangeByScoreIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRangeByScoreIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRangeByScoreIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRangeByScoreIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRangeIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRangeIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRangeIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRangeIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRankIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRankIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRankIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRankIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRemIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRemIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRemIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRemIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRemRangeByLexIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRemRangeByLexIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRemRangeByLexIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRemRangeByLexIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRemRangeByRankIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRemRangeByRankIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRemRangeByRankIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRemRangeByRankIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRemRangeByScoreIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRemRangeByScoreIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRemRangeByScoreIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRemRangeByScoreIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRevRangeByLexIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRevRangeByLexIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRevRangeByLexIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRevRangeByLexIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRevRangeByScoreIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRevRangeByScoreIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRevRangeByScoreIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRevRangeByScoreIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRevRangeIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRevRangeIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRevRangeIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRevRangeIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRevRankIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRevRankIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRevRankIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRevRankIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZScanIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZScanIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZScanIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZScanIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZScoreIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZScoreIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZScoreIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZScoreIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZUnionStoreIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZUnionStoreIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZUnionStoreIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZUnionStoreIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZAddIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZAddIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZAddIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZAddIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZCardIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZCardIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZCardIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZCardIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZCountIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZCountIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZCountIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZCountIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZIncrByIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZIncrByIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZIncrByIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZIncrByIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZInterStoreIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZInterStoreIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZInterStoreIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZInterStoreIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZLexCountIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZLexCountIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZLexCountIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZLexCountIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZPopMaxIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZPopMaxIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZPopMaxIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZPopMaxIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZPopMinIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZPopMinIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZPopMinIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZPopMinIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByLexIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByLexIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByLexIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByLexIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByScoreIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByScoreIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByScoreIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByScoreIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRankIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRankIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRankIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRankIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByLexIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByLexIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByLexIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByLexIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByRankIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByRankIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByRankIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByRankIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByScoreIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByScoreIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByScoreIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByScoreIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeByLexIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeByLexIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeByLexIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeByLexIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeByScoreIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeByScoreIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeByScoreIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeByScoreIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRankIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRankIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRankIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRankIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZScanIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZScanIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZScanIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZScanIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZScoreIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZScoreIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZScoreIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZScoreIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZUnionStoreIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZUnionStoreIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZUnionStoreIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/sortedset/ZUnionStoreIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractAppendIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractAppendIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractAppendIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractAppendIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractAppendMemoryIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractAppendMemoryIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractAppendMemoryIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractAppendMemoryIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractBitCountIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractBitCountIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractBitCountIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractBitCountIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractBitOpIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractBitOpIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractBitOpIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractBitOpIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractBitPosIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractBitPosIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractBitPosIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractBitPosIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractDecrByIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractDecrByIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractDecrByIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractDecrByIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractDecrIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractDecrIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractDecrIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractDecrIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractGetBitIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractGetBitIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractGetBitIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractGetBitIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractGetIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractGetIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractGetIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractGetIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractGetRangeIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractGetRangeIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractGetRangeIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractGetRangeIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractGetSetIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractGetSetIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractGetSetIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractGetSetIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractIncrByFloatIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractIncrByFloatIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractIncrByFloatIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractIncrByFloatIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractIncrByIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractIncrByIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractIncrByIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractIncrByIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractIncrIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractIncrIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractIncrIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractIncrIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractLettuceAppendIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractLettuceAppendIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractLettuceAppendIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractLettuceAppendIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractMGetIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractMGetIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractMGetIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractMGetIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractMSetIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractMSetIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractMSetIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractMSetIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractMSetNXIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractMSetNXIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractMSetNXIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractMSetNXIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractPSetEXIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractPSetEXIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractPSetEXIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractPSetEXIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractSetBitIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractSetBitIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractSetBitIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractSetBitIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractSetEXIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractSetEXIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractSetEXIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractSetEXIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractSetIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractSetIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractSetIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractSetIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractSetNXIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractSetNXIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractSetNXIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractSetNXIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractSetRangeIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractSetRangeIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractSetRangeIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractSetRangeIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractStringIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractStringIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractStringIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AbstractStringIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AppendIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AppendIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AppendIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AppendIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AppendMemoryIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AppendMemoryIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AppendMemoryIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/AppendMemoryIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/BitCountIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/BitCountIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/BitCountIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/BitCountIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/BitOpIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/BitOpIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/BitOpIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/BitOpIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/BitPosIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/BitPosIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/BitPosIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/BitPosIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/DecrByIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/DecrByIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/DecrByIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/DecrByIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/DecrIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/DecrIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/DecrIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/DecrIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/GetBitIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/GetBitIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/GetBitIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/GetBitIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/GetIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/GetIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/GetIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/GetIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/GetRangeIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/GetRangeIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/GetRangeIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/GetRangeIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/GetSetIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/GetSetIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/GetSetIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/GetSetIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/IncrByFloatIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/IncrByFloatIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/IncrByFloatIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/IncrByFloatIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/IncrByIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/IncrByIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/IncrByIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/IncrByIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/IncrIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/IncrIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/IncrIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/IncrIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/LettuceAppendIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/LettuceAppendIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/LettuceAppendIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/LettuceAppendIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/MGetIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/MGetIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/MGetIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/MGetIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/MSetIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/MSetIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/MSetIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/MSetIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/MSetNXIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/MSetNXIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/MSetNXIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/MSetNXIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/PSetEXIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/PSetEXIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/PSetEXIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/PSetEXIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/SetBitIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/SetBitIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/SetBitIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/SetBitIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/SetEXIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/SetEXIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/SetEXIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/SetEXIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/SetIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/SetIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/SetIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/SetIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/SetNXIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/SetNXIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/SetNXIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/SetNXIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/SetRangeIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/SetRangeIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/SetRangeIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/SetRangeIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/StringIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/StringIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/StringIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/string/StringIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/pubsub/SubscriptionsIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/pubsub/SubscriptionsIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/pubsub/SubscriptionsIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/pubsub/SubscriptionsIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/services/LockingStripedCoordinatorIntegrationTest.java b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/services/LockingStripedCoordinatorIntegrationTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/services/LockingStripedCoordinatorIntegrationTest.java
rename to geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/services/LockingStripedCoordinatorIntegrationTest.java
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt b/geode-for-redis/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
rename to geode-for-redis/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
diff --git a/geode-apis-compatible-with-redis/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt b/geode-for-redis/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
similarity index 100%
rename from geode-apis-compatible-with-redis/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
rename to geode-for-redis/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
diff --git a/geode-apis-compatible-with-redis/src/jmh/java/org/apache/geode/redis/internal/collections/OrderedStatisticTreeBenchmark.java b/geode-for-redis/src/jmh/java/org/apache/geode/redis/internal/collections/OrderedStatisticTreeBenchmark.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/jmh/java/org/apache/geode/redis/internal/collections/OrderedStatisticTreeBenchmark.java
rename to geode-for-redis/src/jmh/java/org/apache/geode/redis/internal/collections/OrderedStatisticTreeBenchmark.java
diff --git a/geode-apis-compatible-with-redis/src/jmh/java/org/apache/geode/redis/internal/collections/RedisHashMapBenchmark.java b/geode-for-redis/src/jmh/java/org/apache/geode/redis/internal/collections/RedisHashMapBenchmark.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/jmh/java/org/apache/geode/redis/internal/collections/RedisHashMapBenchmark.java
rename to geode-for-redis/src/jmh/java/org/apache/geode/redis/internal/collections/RedisHashMapBenchmark.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/GeodeRedisServer.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/GeodeRedisServer.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/GeodeRedisServer.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/GeodeRedisServer.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/GeodeRedisService.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/GeodeRedisService.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/GeodeRedisService.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/GeodeRedisService.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/PassiveExpirationManager.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/PassiveExpirationManager.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/PassiveExpirationManager.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/PassiveExpirationManager.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/RedisCommandSupportLevel.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/RedisCommandSupportLevel.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/RedisCommandSupportLevel.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/RedisCommandSupportLevel.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/RedisCommandType.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/RedisCommandType.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/RedisCommandType.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/RedisCommandType.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/RedisConstants.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/RedisConstants.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/RedisConstants.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/RedisConstants.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/RedisException.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/RedisException.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/RedisException.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/RedisException.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/RedisSanctionedSerializablesService.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/RedisSanctionedSerializablesService.java
similarity index 91%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/RedisSanctionedSerializablesService.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/RedisSanctionedSerializablesService.java
index 6fed4e4..7d26682 100644
--- a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/RedisSanctionedSerializablesService.java
+++ b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/RedisSanctionedSerializablesService.java
@@ -22,6 +22,6 @@ public class RedisSanctionedSerializablesService implements SanctionedSerializab
 
   @Override
   public URL getSanctionedSerializablesURL() {
-    return getClass().getResource("sanctioned-geode-apis-compatible-with-redis-serializables.txt");
+    return getClass().getResource("sanctioned-geode-for-redis-serializables.txt");
   }
 }
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/RegionProvider.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/RegionProvider.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/RegionProvider.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/RegionProvider.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/SlotAdvisor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/SlotAdvisor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/SlotAdvisor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/SlotAdvisor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/cluster/RedisMemberInfo.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/cluster/RedisMemberInfo.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/cluster/RedisMemberInfo.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/cluster/RedisMemberInfo.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/cluster/RedisMemberInfoRetrievalFunction.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/cluster/RedisMemberInfoRetrievalFunction.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/cluster/RedisMemberInfoRetrievalFunction.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/cluster/RedisMemberInfoRetrievalFunction.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/collections/Bytes2ObjectOpenHashMap.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/collections/Bytes2ObjectOpenHashMap.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/collections/Bytes2ObjectOpenHashMap.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/collections/Bytes2ObjectOpenHashMap.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/collections/IndexibleTreeSet.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/collections/IndexibleTreeSet.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/collections/IndexibleTreeSet.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/collections/IndexibleTreeSet.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/collections/OrderStatisticsSet.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/collections/OrderStatisticsSet.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/collections/OrderStatisticsSet.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/collections/OrderStatisticsSet.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/collections/OrderStatisticsTree.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/collections/OrderStatisticsTree.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/collections/OrderStatisticsTree.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/collections/OrderStatisticsTree.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/collections/SizeableBytes2ObjectOpenCustomHashMapWithCursor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/collections/SizeableBytes2ObjectOpenCustomHashMapWithCursor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/collections/SizeableBytes2ObjectOpenCustomHashMapWithCursor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/collections/SizeableBytes2ObjectOpenCustomHashMapWithCursor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/collections/SizeableObjectOpenCustomHashSet.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/collections/SizeableObjectOpenCustomHashSet.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/collections/SizeableObjectOpenCustomHashSet.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/collections/SizeableObjectOpenCustomHashSet.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/collections/package-info.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/collections/package-info.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/collections/package-info.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/collections/package-info.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/AbstractRedisData.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/AbstractRedisData.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/AbstractRedisData.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/AbstractRedisData.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/KeyHashUtil.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/KeyHashUtil.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/KeyHashUtil.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/KeyHashUtil.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/NullRedisData.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/NullRedisData.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/NullRedisData.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/NullRedisData.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/NullRedisDataStructures.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/NullRedisDataStructures.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/NullRedisDataStructures.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/NullRedisDataStructures.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/NullRedisHash.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/NullRedisHash.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/NullRedisHash.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/NullRedisHash.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/NullRedisSet.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/NullRedisSet.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/NullRedisSet.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/NullRedisSet.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/NullRedisSortedSet.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/NullRedisSortedSet.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/NullRedisSortedSet.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/NullRedisSortedSet.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/NullRedisString.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/NullRedisString.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/NullRedisString.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/NullRedisString.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisData.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisData.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisData.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisData.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisDataCommandsFunctionExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisDataCommandsFunctionExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisDataCommandsFunctionExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisDataCommandsFunctionExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisDataMovedException.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisDataMovedException.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisDataMovedException.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisDataMovedException.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisDataType.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisDataType.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisDataType.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisDataType.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisDataTypeMismatchException.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisDataTypeMismatchException.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisDataTypeMismatchException.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisDataTypeMismatchException.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisHash.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisHash.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisHash.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisHash.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisHashCommandsFunctionExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisHashCommandsFunctionExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisHashCommandsFunctionExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisHashCommandsFunctionExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisKey.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisKey.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisKey.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisKey.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisKeyCommandsFunctionExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisKeyCommandsFunctionExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisKeyCommandsFunctionExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisKeyCommandsFunctionExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisKeyExistsException.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisKeyExistsException.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisKeyExistsException.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisKeyExistsException.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSet.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSet.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSet.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSet.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSetCommandsFunctionExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSetCommandsFunctionExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSetCommandsFunctionExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSetCommandsFunctionExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSortedSet.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSortedSet.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSortedSet.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSortedSet.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSortedSetCommandsFunctionExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSortedSetCommandsFunctionExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSortedSetCommandsFunctionExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSortedSetCommandsFunctionExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisString.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisString.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisString.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisString.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisStringCommandsFunctionExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisStringCommandsFunctionExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisStringCommandsFunctionExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisStringCommandsFunctionExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/delta/AddsDeltaInfo.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/delta/AddsDeltaInfo.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/delta/AddsDeltaInfo.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/delta/AddsDeltaInfo.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/delta/AppendDeltaInfo.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/delta/AppendDeltaInfo.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/delta/AppendDeltaInfo.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/delta/AppendDeltaInfo.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/delta/DeltaInfo.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/delta/DeltaInfo.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/delta/DeltaInfo.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/delta/DeltaInfo.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/delta/DeltaType.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/delta/DeltaType.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/delta/DeltaType.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/delta/DeltaType.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/delta/RemsDeltaInfo.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/delta/RemsDeltaInfo.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/delta/RemsDeltaInfo.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/delta/RemsDeltaInfo.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/delta/TimestampDeltaInfo.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/delta/TimestampDeltaInfo.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/delta/TimestampDeltaInfo.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/delta/TimestampDeltaInfo.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/delta/ZAddsDeltaInfo.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/delta/ZAddsDeltaInfo.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/delta/ZAddsDeltaInfo.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/delta/ZAddsDeltaInfo.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/AbstractExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/AbstractExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/AbstractExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/AbstractExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/BaseSetOptions.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/BaseSetOptions.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/BaseSetOptions.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/BaseSetOptions.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/Executor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/Executor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/Executor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/Executor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/GlobPattern.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/GlobPattern.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/GlobPattern.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/GlobPattern.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/RedisResponse.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/RedisResponse.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/RedisResponse.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/RedisResponse.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/SingleResultCollector.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/SingleResultCollector.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/SingleResultCollector.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/SingleResultCollector.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/UnknownExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/UnknownExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/UnknownExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/UnknownExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/cluster/CRC16.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/cluster/CRC16.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/cluster/CRC16.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/cluster/CRC16.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/cluster/ClusterExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/cluster/ClusterExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/cluster/ClusterExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/cluster/ClusterExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/cluster/RedisPartitionResolver.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/cluster/RedisPartitionResolver.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/cluster/RedisPartitionResolver.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/cluster/RedisPartitionResolver.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/connection/AuthExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/connection/AuthExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/connection/AuthExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/connection/AuthExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/connection/EchoExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/connection/EchoExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/connection/EchoExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/connection/EchoExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/connection/PingExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/connection/PingExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/connection/PingExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/connection/PingExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/connection/QuitExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/connection/QuitExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/connection/QuitExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/connection/QuitExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/connection/SelectExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/connection/SelectExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/connection/SelectExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/connection/SelectExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HDelExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HDelExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HDelExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HDelExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HExistsExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HExistsExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HExistsExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HExistsExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HGetAllExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HGetAllExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HGetAllExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HGetAllExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HGetExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HGetExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HGetExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HGetExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HIncrByExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HIncrByExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HIncrByExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HIncrByExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HIncrByFloatExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HIncrByFloatExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HIncrByFloatExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HIncrByFloatExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HKeysExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HKeysExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HKeysExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HKeysExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HLenExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HLenExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HLenExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HLenExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HMGetExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HMGetExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HMGetExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HMGetExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HMSetExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HMSetExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HMSetExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HMSetExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HScanExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HScanExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HScanExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HScanExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HSetExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HSetExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HSetExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HSetExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HSetNXExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HSetNXExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HSetNXExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HSetNXExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HStrLenExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HStrLenExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HStrLenExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HStrLenExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HValsExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HValsExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HValsExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HValsExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/RedisHashCommands.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/RedisHashCommands.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/RedisHashCommands.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/RedisHashCommands.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/AbstractRenameExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/AbstractRenameExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/AbstractRenameExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/AbstractRenameExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/AbstractScanExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/AbstractScanExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/AbstractScanExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/AbstractScanExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/DelExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/DelExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/DelExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/DelExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/DumpExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/DumpExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/DumpExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/DumpExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/ExistsExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/ExistsExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/ExistsExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/ExistsExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/ExpireAtExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/ExpireAtExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/ExpireAtExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/ExpireAtExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/ExpireExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/ExpireExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/ExpireExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/ExpireExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/KeysExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/KeysExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/KeysExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/KeysExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/PExpireAtExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/PExpireAtExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/PExpireAtExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/PExpireAtExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/PExpireExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/PExpireExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/PExpireExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/PExpireExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/PTTLExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/PTTLExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/PTTLExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/PTTLExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/PersistExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/PersistExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/PersistExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/PersistExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/RedisKeyCommands.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/RedisKeyCommands.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/RedisKeyCommands.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/RedisKeyCommands.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/RenameExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/RenameExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/RenameExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/RenameExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/RenameNXExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/RenameNXExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/RenameNXExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/RenameNXExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/RestoreExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/RestoreExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/RestoreExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/RestoreExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/RestoreOptions.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/RestoreOptions.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/RestoreOptions.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/RestoreOptions.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/ScanExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/ScanExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/ScanExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/ScanExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/TTLExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/TTLExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/TTLExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/TTLExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/TypeExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/TypeExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/key/TypeExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/TypeExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/pubsub/PsubscribeExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/pubsub/PsubscribeExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/pubsub/PsubscribeExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/pubsub/PsubscribeExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/pubsub/PubSubExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/pubsub/PubSubExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/pubsub/PubSubExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/pubsub/PubSubExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/pubsub/PublishExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/pubsub/PublishExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/pubsub/PublishExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/pubsub/PublishExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/pubsub/PunsubscribeExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/pubsub/PunsubscribeExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/pubsub/PunsubscribeExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/pubsub/PunsubscribeExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/pubsub/SubscribeExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/pubsub/SubscribeExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/pubsub/SubscribeExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/pubsub/SubscribeExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/pubsub/UnsubscribeExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/pubsub/UnsubscribeExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/pubsub/UnsubscribeExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/pubsub/UnsubscribeExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/server/CommandExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/server/CommandExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/server/CommandExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/server/CommandExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/server/DBSizeExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/server/DBSizeExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/server/DBSizeExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/server/DBSizeExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/server/FlushAllExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/server/FlushAllExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/server/FlushAllExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/server/FlushAllExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/server/InfoExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/server/InfoExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/server/InfoExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/server/InfoExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/server/LolWutExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/server/LolWutExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/server/LolWutExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/server/LolWutExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/server/ShutDownExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/server/ShutDownExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/server/ShutDownExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/server/ShutDownExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/server/SlowlogExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/server/SlowlogExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/server/SlowlogExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/server/SlowlogExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/server/TimeExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/server/TimeExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/server/TimeExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/server/TimeExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/set/RedisSetCommands.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/set/RedisSetCommands.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/set/RedisSetCommands.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/set/RedisSetCommands.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SAddExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SAddExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SAddExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SAddExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SCardExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SCardExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SCardExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SCardExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SDiffExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SDiffExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SDiffExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SDiffExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SDiffStoreExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SDiffStoreExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SDiffStoreExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SDiffStoreExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SInterExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SInterExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SInterExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SInterExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SInterStoreExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SInterStoreExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SInterStoreExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SInterStoreExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SIsMemberExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SIsMemberExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SIsMemberExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SIsMemberExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SMembersExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SMembersExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SMembersExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SMembersExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SMoveExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SMoveExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SMoveExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SMoveExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SPopExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SPopExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SPopExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SPopExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SRandMemberExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SRandMemberExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SRandMemberExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SRandMemberExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SRemExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SRemExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SRemExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SRemExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SScanExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SScanExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SScanExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SScanExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SUnionExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SUnionExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SUnionExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SUnionExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SUnionStoreExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SUnionStoreExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SUnionStoreExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SUnionStoreExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SetOpExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SetOpExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SetOpExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/set/SetOpExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/AbstractSortedSetRangeExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/AbstractSortedSetRangeExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/AbstractSortedSetRangeExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/AbstractSortedSetRangeExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/AbstractSortedSetRangeOptions.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/AbstractSortedSetRangeOptions.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/AbstractSortedSetRangeOptions.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/AbstractSortedSetRangeOptions.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZPopExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZPopExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZPopExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZPopExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRankExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRankExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRankExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/AbstractZRankExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/RedisSortedSetCommands.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/RedisSortedSetCommands.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/RedisSortedSetCommands.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/RedisSortedSetCommands.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/SortedSetLexRangeOptions.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/SortedSetLexRangeOptions.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/SortedSetLexRangeOptions.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/SortedSetLexRangeOptions.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/SortedSetRankRangeOptions.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/SortedSetRankRangeOptions.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/SortedSetRankRangeOptions.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/SortedSetRankRangeOptions.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/SortedSetScoreRangeOptions.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/SortedSetScoreRangeOptions.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/SortedSetScoreRangeOptions.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/SortedSetScoreRangeOptions.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZAddExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZAddExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZAddExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZAddExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZAddOptions.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZAddOptions.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZAddOptions.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZAddOptions.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZAggregator.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZAggregator.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZAggregator.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZAggregator.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZCardExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZCardExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZCardExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZCardExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZCountExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZCountExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZCountExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZCountExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZIncrByExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZIncrByExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZIncrByExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZIncrByExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZInterStoreExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZInterStoreExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZInterStoreExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZInterStoreExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZKeyWeight.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZKeyWeight.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZKeyWeight.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZKeyWeight.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZLexCountExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZLexCountExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZLexCountExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZLexCountExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZPopMaxExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZPopMaxExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZPopMaxExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZPopMaxExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZPopMinExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZPopMinExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZPopMinExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZPopMinExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByLexExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByLexExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByLexExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByLexExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByScoreExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByScoreExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByScoreExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByScoreExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRankExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRankExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRankExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRankExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRemExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRemExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRemExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRemExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByLexExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByLexExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByLexExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByLexExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByRankExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByRankExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByRankExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByRankExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByScoreExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByScoreExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByScoreExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRemRangeByScoreExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeByLexExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeByLexExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeByLexExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeByLexExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeByScoreExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeByScoreExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeByScoreExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeByScoreExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRangeExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRankExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRankExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRankExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRevRankExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZScanExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZScanExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZScanExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZScanExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZScoreExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZScoreExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZScoreExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZScoreExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZStoreExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZStoreExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZStoreExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZStoreExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZUnionStoreExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZUnionStoreExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZUnionStoreExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZUnionStoreExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/AbstractMSetExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/AbstractMSetExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/AbstractMSetExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/AbstractMSetExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/AppendExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/AppendExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/AppendExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/AppendExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/BitCountExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/BitCountExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/BitCountExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/BitCountExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/BitOpExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/BitOpExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/BitOpExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/BitOpExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/BitPosExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/BitPosExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/BitPosExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/BitPosExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/DecrByExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/DecrByExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/DecrByExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/DecrByExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/DecrExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/DecrExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/DecrExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/DecrExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/GetBitExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/GetBitExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/GetBitExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/GetBitExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/GetExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/GetExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/GetExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/GetExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/GetRangeExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/GetRangeExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/GetRangeExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/GetRangeExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/GetSetExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/GetSetExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/GetSetExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/GetSetExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/IncrByExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/IncrByExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/IncrByExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/IncrByExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/IncrByFloatExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/IncrByFloatExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/IncrByFloatExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/IncrByFloatExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/IncrExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/IncrExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/IncrExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/IncrExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/MGetExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/MGetExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/MGetExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/MGetExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/MSetExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/MSetExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/MSetExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/MSetExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/MSetNXExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/MSetNXExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/MSetNXExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/MSetNXExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/PSetEXExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/PSetEXExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/PSetEXExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/PSetEXExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/RedisStringCommands.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/RedisStringCommands.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/RedisStringCommands.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/RedisStringCommands.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/SetBitExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/SetBitExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/SetBitExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/SetBitExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/SetEXExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/SetEXExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/SetEXExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/SetEXExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/SetExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/SetExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/SetExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/SetExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/SetNXExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/SetNXExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/SetNXExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/SetNXExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/SetOptions.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/SetOptions.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/SetOptions.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/SetOptions.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/SetRangeExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/SetRangeExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/SetRangeExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/SetRangeExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/StrlenExecutor.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/StrlenExecutor.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/string/StrlenExecutor.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/string/StrlenExecutor.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/netty/ByteToCommandDecoder.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/netty/ByteToCommandDecoder.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/netty/ByteToCommandDecoder.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/netty/ByteToCommandDecoder.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/netty/Client.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/netty/Client.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/netty/Client.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/netty/Client.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/netty/Coder.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/netty/Coder.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/netty/Coder.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/netty/Coder.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/netty/CoderException.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/netty/CoderException.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/netty/CoderException.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/netty/CoderException.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/netty/Command.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/netty/Command.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/netty/Command.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/netty/Command.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/netty/ExecutionHandlerContext.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/netty/ExecutionHandlerContext.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/netty/ExecutionHandlerContext.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/netty/ExecutionHandlerContext.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/netty/NettyRedisServer.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/netty/NettyRedisServer.java
similarity index 99%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/netty/NettyRedisServer.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/netty/NettyRedisServer.java
index 1df95c8..ef44718 100644
--- a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/netty/NettyRedisServer.java
+++ b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/netty/NettyRedisServer.java
@@ -104,7 +104,7 @@ public class NettyRedisServer {
 
     if (port < RANDOM_PORT_INDICATOR) {
       throw new IllegalArgumentException(
-          "The compatible-with-redis-port cannot be less than " + RANDOM_PORT_INDICATOR);
+          "The geode-for-redis-port cannot be less than " + RANDOM_PORT_INDICATOR);
     }
 
     selectorGroup = createEventLoopGroup("Selector", true, 1);
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/netty/RedisCommandParserException.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/netty/RedisCommandParserException.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/netty/RedisCommandParserException.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/netty/RedisCommandParserException.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/netty/StringBytesGlossary.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/netty/StringBytesGlossary.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/netty/StringBytesGlossary.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/netty/StringBytesGlossary.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/parameters/ClusterParameterRequirements.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/parameters/ClusterParameterRequirements.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/parameters/ClusterParameterRequirements.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/parameters/ClusterParameterRequirements.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/parameters/Parameter.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/parameters/Parameter.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/parameters/Parameter.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/parameters/Parameter.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/parameters/RedisParametersMismatchException.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/parameters/RedisParametersMismatchException.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/parameters/RedisParametersMismatchException.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/parameters/RedisParametersMismatchException.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/parameters/SlowlogParameterRequirements.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/parameters/SlowlogParameterRequirements.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/parameters/SlowlogParameterRequirements.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/parameters/SlowlogParameterRequirements.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/pubsub/AbstractSubscriptionManager.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/pubsub/AbstractSubscriptionManager.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/pubsub/AbstractSubscriptionManager.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/pubsub/AbstractSubscriptionManager.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/pubsub/ChannelClientSubscriptionManager.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/pubsub/ChannelClientSubscriptionManager.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/pubsub/ChannelClientSubscriptionManager.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/pubsub/ChannelClientSubscriptionManager.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/pubsub/ChannelSubscriptionManager.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/pubsub/ChannelSubscriptionManager.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/pubsub/ChannelSubscriptionManager.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/pubsub/ChannelSubscriptionManager.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/pubsub/ClientSubscriptionManager.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/pubsub/ClientSubscriptionManager.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/pubsub/ClientSubscriptionManager.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/pubsub/ClientSubscriptionManager.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/pubsub/PatternClientSubscriptionManager.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/pubsub/PatternClientSubscriptionManager.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/pubsub/PatternClientSubscriptionManager.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/pubsub/PatternClientSubscriptionManager.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/pubsub/PatternSubscriptionManager.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/pubsub/PatternSubscriptionManager.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/pubsub/PatternSubscriptionManager.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/pubsub/PatternSubscriptionManager.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/pubsub/PubSub.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/pubsub/PubSub.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/pubsub/PubSub.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/pubsub/PubSub.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/pubsub/PubSubImpl.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/pubsub/PubSubImpl.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/pubsub/PubSubImpl.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/pubsub/PubSubImpl.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/pubsub/SubscribeResult.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/pubsub/SubscribeResult.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/pubsub/SubscribeResult.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/pubsub/SubscribeResult.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/pubsub/Subscription.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/pubsub/Subscription.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/pubsub/Subscription.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/pubsub/Subscription.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/pubsub/SubscriptionImpl.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/pubsub/SubscriptionImpl.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/pubsub/SubscriptionImpl.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/pubsub/SubscriptionImpl.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/pubsub/SubscriptionManager.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/pubsub/SubscriptionManager.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/pubsub/SubscriptionManager.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/pubsub/SubscriptionManager.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/pubsub/Subscriptions.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/pubsub/Subscriptions.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/pubsub/Subscriptions.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/pubsub/Subscriptions.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/services/LockingStripedCoordinator.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/services/LockingStripedCoordinator.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/services/LockingStripedCoordinator.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/services/LockingStripedCoordinator.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/services/StripedCallable.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/services/StripedCallable.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/services/StripedCallable.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/services/StripedCallable.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/services/StripedCoordinator.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/services/StripedCoordinator.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/services/StripedCoordinator.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/services/StripedCoordinator.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/services/StripedExecutorService.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/services/StripedExecutorService.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/services/StripedExecutorService.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/services/StripedExecutorService.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/services/StripedObject.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/services/StripedObject.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/services/StripedObject.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/services/StripedObject.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/services/StripedRunnable.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/services/StripedRunnable.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/services/StripedRunnable.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/services/StripedRunnable.java
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/statistics/GeodeRedisStats.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/statistics/GeodeRedisStats.java
similarity index 99%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/statistics/GeodeRedisStats.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/statistics/GeodeRedisStats.java
index 514e2b0..0d8b695 100644
--- a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/statistics/GeodeRedisStats.java
+++ b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/statistics/GeodeRedisStats.java
@@ -71,7 +71,7 @@ public class GeodeRedisStats {
         descriptorList.toArray(new StatisticDescriptor[descriptorList.size()]);
 
     type = statisticsTypeFactory
-        .createType("statsForServerCompatibleWithRedis",
+        .createType("statsForServergeodeForRedis",
             "Statistics for a Geode server compatible with Redis",
             descriptorArray);
 
diff --git a/geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/statistics/RedisStats.java b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/statistics/RedisStats.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/statistics/RedisStats.java
rename to geode-for-redis/src/main/java/org/apache/geode/redis/internal/statistics/RedisStats.java
diff --git a/geode-apis-compatible-with-redis/src/main/resources/META-INF/services/org.apache.geode.internal.cache.CacheService b/geode-for-redis/src/main/resources/META-INF/services/org.apache.geode.internal.cache.CacheService
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/resources/META-INF/services/org.apache.geode.internal.cache.CacheService
rename to geode-for-redis/src/main/resources/META-INF/services/org.apache.geode.internal.cache.CacheService
diff --git a/geode-apis-compatible-with-redis/src/main/resources/META-INF/services/org.apache.geode.internal.serialization.SanctionedSerializablesService b/geode-for-redis/src/main/resources/META-INF/services/org.apache.geode.internal.serialization.SanctionedSerializablesService
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/resources/META-INF/services/org.apache.geode.internal.serialization.SanctionedSerializablesService
rename to geode-for-redis/src/main/resources/META-INF/services/org.apache.geode.internal.serialization.SanctionedSerializablesService
diff --git a/geode-apis-compatible-with-redis/src/main/resources/org/apache/geode/redis/internal/sanctioned-geode-apis-compatible-with-redis-serializables.txt b/geode-for-redis/src/main/resources/org/apache/geode/redis/internal/sanctioned-geode-apis-compatible-with-redis-serializables.txt
similarity index 100%
rename from geode-apis-compatible-with-redis/src/main/resources/org/apache/geode/redis/internal/sanctioned-geode-apis-compatible-with-redis-serializables.txt
rename to geode-for-redis/src/main/resources/org/apache/geode/redis/internal/sanctioned-geode-apis-compatible-with-redis-serializables.txt
diff --git a/geode-apis-compatible-with-redis/src/performanceTest/benchmark.sh b/geode-for-redis/src/performanceTest/benchmark.sh
similarity index 100%
rename from geode-apis-compatible-with-redis/src/performanceTest/benchmark.sh
rename to geode-for-redis/src/performanceTest/benchmark.sh
diff --git a/geode-apis-compatible-with-redis/src/performanceTest/environment-setup.sh b/geode-for-redis/src/performanceTest/environment-setup.sh
similarity index 94%
rename from geode-apis-compatible-with-redis/src/performanceTest/environment-setup.sh
rename to geode-for-redis/src/performanceTest/environment-setup.sh
index 36c6fb5..4c29006 100755
--- a/geode-apis-compatible-with-redis/src/performanceTest/environment-setup.sh
+++ b/geode-for-redis/src/performanceTest/environment-setup.sh
@@ -55,7 +55,7 @@ while getopts ":f:rgt:c:h:p:" opt; do
 done
 
 if [ -z ${SERVER_TYPE} ]; then
-  echo "Please specify native Redis (-r) or Geode APIs compatible with Redis (-g)"
+  echo "Please specify native Redis (-r) or Geode for Redis (-g)"
   exit 1
 fi
 
@@ -101,8 +101,8 @@ if [ ${SERVER_TYPE} == "geode" ]; then
           --log-level=none
           --locators=localhost[10334]
           --server-port=0
-          --compatible-with-redis-port=6379
-          --compatible-with-redis-bind-address=127.0.0.1"
+          --geode-for-redis-port=6379
+          --geode-for-redis-bind-address=127.0.0.1"
 else
   if [ ${SERVER_NOT_FOUND} -eq 1 ]; then
     echo "No server compatible with Redis detected on host '${REDIS_HOST}' at port '${REDIS_PORT}'"
diff --git a/geode-apis-compatible-with-redis/src/performanceTest/execute-operation.sh b/geode-for-redis/src/performanceTest/execute-operation.sh
similarity index 100%
rename from geode-apis-compatible-with-redis/src/performanceTest/execute-operation.sh
rename to geode-for-redis/src/performanceTest/execute-operation.sh
diff --git a/geode-apis-compatible-with-redis/src/performanceTest/shacompare.sh b/geode-for-redis/src/performanceTest/shacompare.sh
similarity index 100%
rename from geode-apis-compatible-with-redis/src/performanceTest/shacompare.sh
rename to geode-for-redis/src/performanceTest/shacompare.sh
diff --git a/geode-apis-compatible-with-redis/src/performanceTest/summarize-batch-results.sh b/geode-for-redis/src/performanceTest/summarize-batch-results.sh
similarity index 100%
rename from geode-apis-compatible-with-redis/src/performanceTest/summarize-batch-results.sh
rename to geode-for-redis/src/performanceTest/summarize-batch-results.sh
diff --git a/geode-apis-compatible-with-redis/src/performanceTest/summarize-operation-results.sh b/geode-for-redis/src/performanceTest/summarize-operation-results.sh
similarity index 100%
rename from geode-apis-compatible-with-redis/src/performanceTest/summarize-operation-results.sh
rename to geode-for-redis/src/performanceTest/summarize-operation-results.sh
diff --git a/geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/RegionProviderJUnitTest.java b/geode-for-redis/src/test/java/org/apache/geode/redis/internal/RegionProviderJUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/RegionProviderJUnitTest.java
rename to geode-for-redis/src/test/java/org/apache/geode/redis/internal/RegionProviderJUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/collections/OrderStatisticsTreeTest.java b/geode-for-redis/src/test/java/org/apache/geode/redis/internal/collections/OrderStatisticsTreeTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/collections/OrderStatisticsTreeTest.java
rename to geode-for-redis/src/test/java/org/apache/geode/redis/internal/collections/OrderStatisticsTreeTest.java
diff --git a/geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/collections/OrderedStatisticTreeQuickCheckTest.java b/geode-for-redis/src/test/java/org/apache/geode/redis/internal/collections/OrderedStatisticTreeQuickCheckTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/collections/OrderedStatisticTreeQuickCheckTest.java
rename to geode-for-redis/src/test/java/org/apache/geode/redis/internal/collections/OrderedStatisticTreeQuickCheckTest.java
diff --git a/geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/collections/SizeableBytes2ObjectOpenCustomHashMapWithCursorQuickCheckTest.java b/geode-for-redis/src/test/java/org/apache/geode/redis/internal/collections/SizeableBytes2ObjectOpenCustomHashMapWithCursorQuickCheckTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/collections/SizeableBytes2ObjectOpenCustomHashMapWithCursorQuickCheckTest.java
rename to geode-for-redis/src/test/java/org/apache/geode/redis/internal/collections/SizeableBytes2ObjectOpenCustomHashMapWithCursorQuickCheckTest.java
diff --git a/geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/collections/SizeableBytes2ObjectOpenCustomHashMapWithCursorTest.java b/geode-for-redis/src/test/java/org/apache/geode/redis/internal/collections/SizeableBytes2ObjectOpenCustomHashMapWithCursorTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/collections/SizeableBytes2ObjectOpenCustomHashMapWithCursorTest.java
rename to geode-for-redis/src/test/java/org/apache/geode/redis/internal/collections/SizeableBytes2ObjectOpenCustomHashMapWithCursorTest.java
diff --git a/geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/collections/SizeableObjectOpenCustomHashSetTest.java b/geode-for-redis/src/test/java/org/apache/geode/redis/internal/collections/SizeableObjectOpenCustomHashSetTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/collections/SizeableObjectOpenCustomHashSetTest.java
rename to geode-for-redis/src/test/java/org/apache/geode/redis/internal/collections/SizeableObjectOpenCustomHashSetTest.java
diff --git a/geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/data/KeyHashUtilTest.java b/geode-for-redis/src/test/java/org/apache/geode/redis/internal/data/KeyHashUtilTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/data/KeyHashUtilTest.java
rename to geode-for-redis/src/test/java/org/apache/geode/redis/internal/data/KeyHashUtilTest.java
diff --git a/geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/data/RedisHashTest.java b/geode-for-redis/src/test/java/org/apache/geode/redis/internal/data/RedisHashTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/data/RedisHashTest.java
rename to geode-for-redis/src/test/java/org/apache/geode/redis/internal/data/RedisHashTest.java
diff --git a/geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/data/RedisKeyJUnitTest.java b/geode-for-redis/src/test/java/org/apache/geode/redis/internal/data/RedisKeyJUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/data/RedisKeyJUnitTest.java
rename to geode-for-redis/src/test/java/org/apache/geode/redis/internal/data/RedisKeyJUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/data/RedisSetTest.java b/geode-for-redis/src/test/java/org/apache/geode/redis/internal/data/RedisSetTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/data/RedisSetTest.java
rename to geode-for-redis/src/test/java/org/apache/geode/redis/internal/data/RedisSetTest.java
diff --git a/geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/data/RedisSortedSetTest.java b/geode-for-redis/src/test/java/org/apache/geode/redis/internal/data/RedisSortedSetTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/data/RedisSortedSetTest.java
rename to geode-for-redis/src/test/java/org/apache/geode/redis/internal/data/RedisSortedSetTest.java
diff --git a/geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/data/RedisStringQuickCheckTest.java b/geode-for-redis/src/test/java/org/apache/geode/redis/internal/data/RedisStringQuickCheckTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/data/RedisStringQuickCheckTest.java
rename to geode-for-redis/src/test/java/org/apache/geode/redis/internal/data/RedisStringQuickCheckTest.java
diff --git a/geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/data/RedisStringTest.java b/geode-for-redis/src/test/java/org/apache/geode/redis/internal/data/RedisStringTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/data/RedisStringTest.java
rename to geode-for-redis/src/test/java/org/apache/geode/redis/internal/data/RedisStringTest.java
diff --git a/geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/executor/GlobPatternTest.java b/geode-for-redis/src/test/java/org/apache/geode/redis/internal/executor/GlobPatternTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/executor/GlobPatternTest.java
rename to geode-for-redis/src/test/java/org/apache/geode/redis/internal/executor/GlobPatternTest.java
diff --git a/geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/executor/cluster/CRC16JUnitTest.java b/geode-for-redis/src/test/java/org/apache/geode/redis/internal/executor/cluster/CRC16JUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/executor/cluster/CRC16JUnitTest.java
rename to geode-for-redis/src/test/java/org/apache/geode/redis/internal/executor/cluster/CRC16JUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/executor/sortedset/ZScanExecutorTest.java b/geode-for-redis/src/test/java/org/apache/geode/redis/internal/executor/sortedset/ZScanExecutorTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/executor/sortedset/ZScanExecutorTest.java
rename to geode-for-redis/src/test/java/org/apache/geode/redis/internal/executor/sortedset/ZScanExecutorTest.java
diff --git a/geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/netty/ClientTest.java b/geode-for-redis/src/test/java/org/apache/geode/redis/internal/netty/ClientTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/netty/ClientTest.java
rename to geode-for-redis/src/test/java/org/apache/geode/redis/internal/netty/ClientTest.java
diff --git a/geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/netty/CoderTest.java b/geode-for-redis/src/test/java/org/apache/geode/redis/internal/netty/CoderTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/netty/CoderTest.java
rename to geode-for-redis/src/test/java/org/apache/geode/redis/internal/netty/CoderTest.java
diff --git a/geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/netty/CommandJUnitTest.java b/geode-for-redis/src/test/java/org/apache/geode/redis/internal/netty/CommandJUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/netty/CommandJUnitTest.java
rename to geode-for-redis/src/test/java/org/apache/geode/redis/internal/netty/CommandJUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/pubsub/ChannelClientSubscriptionManagerTest.java b/geode-for-redis/src/test/java/org/apache/geode/redis/internal/pubsub/ChannelClientSubscriptionManagerTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/pubsub/ChannelClientSubscriptionManagerTest.java
rename to geode-for-redis/src/test/java/org/apache/geode/redis/internal/pubsub/ChannelClientSubscriptionManagerTest.java
diff --git a/geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/pubsub/ChannelSubscriptionManagerTest.java b/geode-for-redis/src/test/java/org/apache/geode/redis/internal/pubsub/ChannelSubscriptionManagerTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/pubsub/ChannelSubscriptionManagerTest.java
rename to geode-for-redis/src/test/java/org/apache/geode/redis/internal/pubsub/ChannelSubscriptionManagerTest.java
diff --git a/geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/pubsub/PatternClientSubscriptionManagerTest.java b/geode-for-redis/src/test/java/org/apache/geode/redis/internal/pubsub/PatternClientSubscriptionManagerTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/pubsub/PatternClientSubscriptionManagerTest.java
rename to geode-for-redis/src/test/java/org/apache/geode/redis/internal/pubsub/PatternClientSubscriptionManagerTest.java
diff --git a/geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/pubsub/PatternSubscriptionManagerTest.java b/geode-for-redis/src/test/java/org/apache/geode/redis/internal/pubsub/PatternSubscriptionManagerTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/pubsub/PatternSubscriptionManagerTest.java
rename to geode-for-redis/src/test/java/org/apache/geode/redis/internal/pubsub/PatternSubscriptionManagerTest.java
diff --git a/geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/pubsub/PubSubImplTest.java b/geode-for-redis/src/test/java/org/apache/geode/redis/internal/pubsub/PubSubImplTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/pubsub/PubSubImplTest.java
rename to geode-for-redis/src/test/java/org/apache/geode/redis/internal/pubsub/PubSubImplTest.java
diff --git a/geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/pubsub/SubscriptionImplTest.java b/geode-for-redis/src/test/java/org/apache/geode/redis/internal/pubsub/SubscriptionImplTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/pubsub/SubscriptionImplTest.java
rename to geode-for-redis/src/test/java/org/apache/geode/redis/internal/pubsub/SubscriptionImplTest.java
diff --git a/geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/pubsub/SubscriptionManagerTestBase.java b/geode-for-redis/src/test/java/org/apache/geode/redis/internal/pubsub/SubscriptionManagerTestBase.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/pubsub/SubscriptionManagerTestBase.java
rename to geode-for-redis/src/test/java/org/apache/geode/redis/internal/pubsub/SubscriptionManagerTestBase.java
diff --git a/geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/pubsub/SubscriptionsJUnitTest.java b/geode-for-redis/src/test/java/org/apache/geode/redis/internal/pubsub/SubscriptionsJUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/pubsub/SubscriptionsJUnitTest.java
rename to geode-for-redis/src/test/java/org/apache/geode/redis/internal/pubsub/SubscriptionsJUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/services/LockingStripedCoordinatorTest.java b/geode-for-redis/src/test/java/org/apache/geode/redis/internal/services/LockingStripedCoordinatorTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/services/LockingStripedCoordinatorTest.java
rename to geode-for-redis/src/test/java/org/apache/geode/redis/internal/services/LockingStripedCoordinatorTest.java
diff --git a/geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/services/StripedExecutorServiceJUnitTest.java b/geode-for-redis/src/test/java/org/apache/geode/redis/internal/services/StripedExecutorServiceJUnitTest.java
similarity index 100%
rename from geode-apis-compatible-with-redis/src/test/java/org/apache/geode/redis/internal/services/StripedExecutorServiceJUnitTest.java
rename to geode-for-redis/src/test/java/org/apache/geode/redis/internal/services/StripedExecutorServiceJUnitTest.java
diff --git a/geode-apis-compatible-with-redis/src/test/resources/expected-pom.xml b/geode-for-redis/src/test/resources/expected-pom.xml
similarity index 98%
rename from geode-apis-compatible-with-redis/src/test/resources/expected-pom.xml
rename to geode-for-redis/src/test/resources/expected-pom.xml
index baab199..c8da41f 100644
--- a/geode-apis-compatible-with-redis/src/test/resources/expected-pom.xml
+++ b/geode-for-redis/src/test/resources/expected-pom.xml
@@ -18,7 +18,7 @@
   -->
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.geode</groupId>
-  <artifactId>geode-apis-compatible-with-redis</artifactId>
+  <artifactId>geode-for-redis</artifactId>
   <version>${version}</version>
   <name>Apache Geode</name>
   <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
diff --git a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/StartServerCommand.java b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/StartServerCommand.java
index b62b752..49d2646 100644
--- a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/StartServerCommand.java
+++ b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/StartServerCommand.java
@@ -307,8 +307,8 @@ public class StartServerCommand extends OfflineGfshCommand {
     StartMemberUtils.setPropertyIfNotNull(gemfireProperties,
         ConfigurationProperties.HTTP_SERVICE_BIND_ADDRESS, httpServiceBindAddress);
 
-    // if compatible-with-redis-port, compatible-with-redis-bind-address, or
-    // compatible-with-redis-username are specified in the command line, REDIS_ENABLED should be set
+    // if geode-for-redis-port, geode-for-redis-bind-address, or
+    // geode-for-redis-username are specified in the command line, REDIS_ENABLED should be set
     // to true
     String stringRedisPort;
     stringRedisPort = redisPort == null ? "" : redisPort.toString();
diff --git a/geode-gfsh/src/test/java/org/apache/geode/management/internal/cli/util/HyphenFormatterTest.java b/geode-gfsh/src/test/java/org/apache/geode/management/internal/cli/util/HyphenFormatterTest.java
index 24aba2b..786b3d6 100644
--- a/geode-gfsh/src/test/java/org/apache/geode/management/internal/cli/util/HyphenFormatterTest.java
+++ b/geode-gfsh/src/test/java/org/apache/geode/management/internal/cli/util/HyphenFormatterTest.java
@@ -228,10 +228,10 @@ public class HyphenFormatterTest {
   @Test
   public void optionWithOneHyphenAfterOneJOption() {
     String cmd =
-        "start server --name=me3 --J=-Dgemfire.jmx-manager=true --compatible-with-redis-port=8080";
+        "start server --name=me3 --J=-Dgemfire.jmx-manager=true --geode-for-redis-port=8080";
     String formattedCmd = this.formatter.formatCommand(cmd);
     String expected =
-        "start server --name=me3 --J=\"-Dgemfire.jmx-manager=true\" --compatible-with-redis-port=8080";
+        "start server --name=me3 --J=\"-Dgemfire.jmx-manager=true\" --geode-for-redis-port=8080";
     assertThat(formattedCmd).as(cmd).isEqualTo(expected);
   }
 
@@ -247,10 +247,10 @@ public class HyphenFormatterTest {
   @Test
   public void optionWithOneHyphenAfterTwoJOptions() {
     String cmd =
-        "start server --name=me3 --J=-Dgemfire.jmx-manager=true --J=-Dgemfire.jmx-manager-start=true --compatible-with-redis-port=8080";
+        "start server --name=me3 --J=-Dgemfire.jmx-manager=true --J=-Dgemfire.jmx-manager-start=true --geode-for-redis-port=8080";
     String formattedCmd = this.formatter.formatCommand(cmd);
     String expected =
-        "start server --name=me3 --J=\"-Dgemfire.jmx-manager=true\" --J=\"-Dgemfire.jmx-manager-start=true\" --compatible-with-redis-port=8080";
+        "start server --name=me3 --J=\"-Dgemfire.jmx-manager=true\" --J=\"-Dgemfire.jmx-manager-start=true\" --geode-for-redis-port=8080";
     assertThat(formattedCmd).as(cmd).isEqualTo(expected);
   }
 
diff --git a/settings.gradle b/settings.gradle
index 032b1bb..622139d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -48,7 +48,7 @@ include 'geode-lucene:geode-lucene-test'
 include 'geode-old-client-support'
 include 'geode-wan'
 include 'geode-cq'
-include 'geode-apis-compatible-with-redis'
+include 'geode-for-redis'
 include 'geode-memcached'
 include 'geode-connectors'
 include 'geode-http-service'