diff --git a/man/tpm2_rc_decode.8.in b/man/tpm2_rc_decode.8.in
@@ -26,7 +26,7 @@
 .\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
-.TH tpm2_rc_decode 8 "DECEMBER 2016" Intel "tpm2.0-tools"
+.TH tpm2_rc_decode 8 "DECEMBER 2016" Intel "tpm2-tools"
 .SH NAME
 tpm2_rc_decode\ - convert error codes from the SAPI and TCTI into human readable errors. Analogous to strerror(3), but for the tpm2 stack.
 .SH SYNOPSIS

diff --git a/man/tpm2_readpublic.8.in b/man/tpm2_readpublic.8.in
@@ -26,7 +26,7 @@
 .\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
-.TH tpm2_readpublic 8 "DECEMBER 2016" Intel "tpm2.0-tools"
+.TH tpm2_readpublic 8 "DECEMBER 2016" Intel "tpm2-tools"
 .SH NAME
 tpm2_readpublic\ - Access to the public area of a loaded object.
 .SH SYNOPSIS

diff --git a/man/tpm2_rsadecrypt.8.in b/man/tpm2_rsadecrypt.8.in
@@ -26,7 +26,7 @@
 .\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
-.TH tpm2_rsadecrypt 8 "DECEMBER 2016" Intel "tpm2.0-tools"
+.TH tpm2_rsadecrypt 8 "DECEMBER 2016" Intel "tpm2-tools"
 .SH NAME
 tpm2_rsadecrypt\ - performs RSA decryption using the indicated padding scheme according to
 IETF RFC 3447 (PKCS#1). The scheme of keyHandle should not be TPM_ALG_NULL.

diff --git a/man/tpm2_rsaencrypt.8.in b/man/tpm2_rsaencrypt.8.in
@@ -26,7 +26,7 @@
 .\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
-.TH tpm2_rsaencrypt 8 "DECEMBER 2016" Intel "tpm2.0-tools"
+.TH tpm2_rsaencrypt 8 "DECEMBER 2016" Intel "tpm2-tools"
 .SH NAME
 tpm2_rsaencrypt\ - performs RSA encryption using the indicated padding scheme according to
 IETF RFC 3447. The scheme of keyHandle should not be TPM_ALG_NULL. The key

diff --git a/man/tpm2_send_command.8.in b/man/tpm2_send_command.8.in
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 
-.TH tpm2_send_command 8 "NOVEMBER 2016" Intel "tpm2.0-tools"
+.TH tpm2_send_command 8 "NOVEMBER 2016" Intel "tpm2-tools"
 .SH NAME
 tpm2_send_command \- Send a command to the TPM using the specified TCTI.
 .SH SYNOPSIS

diff --git a/man/tpm2_sign.8.in b/man/tpm2_sign.8.in
@@ -26,7 +26,7 @@
 .\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
-.TH tpm2_sign 8 "DECEMBER 2016" Intel "tpm2.0-tools"
+.TH tpm2_sign 8 "DECEMBER 2016" Intel "tpm2-tools"
 .SH NAME
 tpm2_sign\ - sign an externally provided hash with the specified symmetric or asymmetric
 signing key. If keyHandle references a restricted signing key, then validation

diff --git a/man/tpm2_startup.8.in b/man/tpm2_startup.8.in
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 
-.TH tpm2_startup 8 "NOVEMBER 2016" Intel "tpm2.0-tools"
+.TH tpm2_startup 8 "NOVEMBER 2016" Intel "tpm2-tools"
 .SH NAME
 tpm2_startup \- Send a TPM2_Startup command with either TPM_SU_CLEAR or
 TPM_SU_STATE.

diff --git a/man/tpm2_takeownership.8.in b/man/tpm2_takeownership.8.in
@@ -26,7 +26,7 @@
 .\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
-.TH tpm2_takeownership 8 "DECEMBER 2016" Intel "tpm2.0-tools"
+.TH tpm2_takeownership 8 "DECEMBER 2016" Intel "tpm2-tools"
 .SH NAME
 tpm2_takeownership\ - Inserting authorization values for the ownerAuth, endorsementAuth, and
 lockoutAuth, if any passwd option is missing, assume NULL.

diff --git a/man/tpm2_unseal.8.in b/man/tpm2_unseal.8.in
@@ -26,7 +26,7 @@
 .\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
-.TH tpm2_unseal 8 "DECEMBER 2016" Intel "tpm2.0-tools"
+.TH tpm2_unseal 8 "DECEMBER 2016" Intel "tpm2-tools"
 .SH NAME
 tpm2_unseal\ - returns the data in a loaded Sealed Data Object.
 .SH SYNOPSIS

diff --git a/man/tpm2_verifysignature.8.in b/man/tpm2_verifysignature.8.in
@@ -26,7 +26,7 @@
 .\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
-.TH tpm2_verifysignature 8 "DECEMBER 2016" Intel "tpm2.0-tools"
+.TH tpm2_verifysignature 8 "DECEMBER 2016" Intel "tpm2-tools"
 .SH NAME
 tpm2_verifysignature\ - uses loaded keys to validate a signature on a message with the message digest
 passed to the TPM. If the signature check succeeds, then the TPM will produce

diff --git a/manual b/manual
@@ -1,10 +1,10 @@
-tpm2.0-tools Manual
+tpm2-tools Manual
 ===================
-1. Common steps before running any tools from tpm2.0-tools
+1. Common steps before running any tools from tpm2-tools
 
 First of all, clone TPM2.0-TSS and follow the build process to install it.
 
-Then follow below steps for tpm2.0-tools.
+Then follow below steps for tpm2-tools.
 
 Build:
 $ ./bootstrap

diff --git a/misc/formatters/tpm2.0-eclipse-cdt-formatter.xml b/misc/formatters/tpm2.0-eclipse-cdt-formatter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <profiles version="1">
-<profile kind="CodeFormatterProfile" name="tpm2.0-tools" version="1">
+<profile kind="CodeFormatterProfile" name="tpm2-tools" version="1">
 <setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_exception_specification" value="do not insert"/>
 <setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
 <setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>