diff --git a/NOTICE b/NOTICE
deleted file mode 100644
index 7376a95..0000000
--- a/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-gocqlx Copyright 2017 ScyllDB
-
-This work contains software from:
-
-* gocql project (https://github.com/gocql/gocql), licensed under the BSD license
-* sqlx project (https://github.com/jmoiron/sqlx), licensed under the MIT license
diff --git a/README.md b/README.md
index 91c9f00..9018d18 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # gocqlx [![GoDoc](http://img.shields.io/badge/go-documentation-blue.svg?style=flat-square)](http://godoc.org/github.com/scylladb/gocqlx) [![Go Report Card](https://goreportcard.com/badge/github.com/scylladb/gocqlx)](https://goreportcard.com/report/github.com/scylladb/gocqlx) [![Build Status](https://travis-ci.org/scylladb/gocqlx.svg?branch=master)](https://travis-ci.org/scylladb/gocqlx)
 
-Package `gocqlx` is a Scylla / Cassandra productivity toolkit for `gocql`. It's 
-similar to what `sqlx` is to `database/sql`.
+Package `gocqlx` is a productivity toolkit for ScyllaDB and Apache Cassandra®. 
+It's an extension of `gocql`, similar to what `sqlx` is to `database/sql`.
 
 It contains wrappers over `gocql` types that provide convenience methods which
 are useful in the development of database driven applications. Under the
@@ -118,3 +118,18 @@ BenchmarkE2EGocqlxSelect-4         30000           2637187 ns/op           27718
 ```
 
 See the [benchmark here](https://github.com/scylladb/gocqlx/blob/master/benchmark_test.go).
+
+## Notice
+
+Copyright (C) 2017 ScyllaDB
+
+gocqlx is distributed under the Apache 2.0 license. See the [LICENSE](https://github.com/scylladb/gocqlx/blob/master/LICENSE) file for details.
+
+This work contains software from:
+
+* [gocql project](https://github.com/gocql/gocql), licensed under the BSD license
+* [sqlx project](https://github.com/jmoiron/sqlx), licensed under the MIT license
+
+Apache®, Apache Cassandra®,  are either registered trademarks or trademarks of 
+the Apache Software Foundation in the United States and/or other countries. 
+No endorsement by The Apache Software Foundation is implied by the use of these marks.
\ No newline at end of file
diff --git a/doc.go b/doc.go
index 5b77f77..884889b 100644
--- a/doc.go
+++ b/doc.go
@@ -1,5 +1,5 @@
-// Package gocqlx is a Scylla / Cassandra productivity toolkit for `gocql`. It's
-// similar to what `sqlx` is to `database/sql`.
+// Package gocqlx is a productivity toolkit for ScyllaDB and Apache Cassandra®.
+// It's an extension of `gocql`, similar to what `sqlx` is to `database/sql`.
 //
 // It contains wrappers over gocql types that provide convenience methods which
 // are useful in the development of database driven applications. Under the
diff --git a/qb/doc.go b/qb/doc.go
index ee4b830..3f2c881 100644
--- a/qb/doc.go
+++ b/qb/doc.go
@@ -1,4 +1,4 @@
-// Package qb provides CQL (Scylla / Cassandra query language) query builders.
-// The builders create CQL statement and a list of named parameters that can
-// later be bound using github.com/scylladb/gocqlx.
+// Package qb provides CQL query builders. The builders create CQL statement
+// and a list of named parameters that can later be bound using
+// github.com/scylladb/gocqlx.
 package qb