diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3728af6..0fcbb11 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 > This project uses [Break Versioning](https://github.com/ptaoussanis/encore/blob/master/BREAK-VERSIONING.md) as of **Aug 16, 2014**.
 
-## v4.0.0-beta1 / 2015 May 26
+## v4.0.0-beta2 / 2015 May 26
 
 > This is a **MAJOR** update. Your custom appenders **WILL BREAK**. Your configuration **MIGHT BREAK**. Your call sites should be fine. I've updated all bundled appenders, but **haven't tested** any 3rd-party appenders.
 
@@ -17,7 +17,7 @@
 * **Fix**: auto shutdown agents to prevent slow app shutdown [#61]
 
 ```clojure
-[com.taoensso/timbre "4.0.0-beta1"]
+[com.taoensso/timbre "4.0.0-beta2"]
 ```
 
 ### Migration checklist
@@ -27,6 +27,7 @@
 * Middleware now apply left->right, not right->left
 * Renamed a default appender: `:standard-out` -> `:println`
 * Renamed config opts: `:timestamp-pattern`, `:timestamp-locale` -> `:timestamp-opts {:pattern _ :locale _ :timezone _}`
+* Renamed config opts: `:whitelist` -> `:ns-whitelist`, `:blacklist` -> `:ns-blacklist`
 * Appender :rate-limit format has changed: `[ncalls ms]` -> `[[ncalls ms] <...>]`
 * Renamed appender args: `:ns`->`:?ns-str`, `:file`->`:?file`, `:line`->`:?line`
 * Appender args now wrapped with delays: `:throwable`->`:?err_`, `:message`->`:msg_`, `:timestamp`->`:timestamp_`, `:hostname`->`:hostname_`, `:args`->`:vargs_`
diff --git a/README.md b/README.md
index 75a04d3..b60c7fc 100644
--- a/README.md
+++ b/README.md
@@ -136,8 +136,8 @@ This is the biggest win over Java logging IMO. Here's `timbre/example-config` (a
 
    ;; Control log filtering by namespaces/patterns. Useful for turning off
    ;; logging in noisy libraries, etc.:
-   :whitelist  [] #_["my-app.foo-ns"]
-   :blacklist  [] #_["taoensso.*"]
+   :ns-whitelist  [] #_["my-app.foo-ns"]
+   :ns-blacklist  [] #_["taoensso.*"]
 
    :middleware [] ; (fns [data]) -> ?data, applied left->right
 
diff --git a/project.clj b/project.clj
index 07716af..67ffc1f 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject com.taoensso/timbre "4.0.0-beta1"
+(defproject com.taoensso/timbre "4.0.0-beta2"
   :author "Peter Taoussanis <https://www.taoensso.com>"
   :description "Clojure/Script logging & profiling library"
   :url "https://github.com/ptaoussanis/timbre"
diff --git a/src/taoensso/timbre.cljx b/src/taoensso/timbre.cljx
index 0291e96..6df01fa 100644
--- a/src/taoensso/timbre.cljx
+++ b/src/taoensso/timbre.cljx
@@ -103,8 +103,8 @@
 
    ;; Control log filtering by namespaces/patterns. Useful for turning off
    ;; logging in noisy libraries, etc.:
-   :whitelist  [] #_["my-app.foo-ns"]
-   :blacklist  [] #_["taoensso.*"]
+   :ns-whitelist  [] #_["my-app.foo-ns"]
+   :ns-blacklist  [] #_["taoensso.*"]
 
    :middleware [] ; (fns [data]) -> ?data, applied left->right
 
@@ -316,7 +316,7 @@
   [level & [?ns-str config]]
   (let [config (or config *config*)]
     (and (level>= level (get-active-level config))
-         (ns-filter (:whitelist config) (:blacklist config) (or ?ns-str ""))
+         (ns-filter (:ns-whitelist config) (:ns-blacklist config) (or ?ns-str ""))
          true)))
 
 (comment (log? :trace))