diff --git a/resources/images/TUF repository tools.png b/resources/images/TUF repository tools.png
deleted file mode 100644
index 3fe9cc9d..00000000
Binary files a/resources/images/TUF repository tools.png and /dev/null differ
diff --git a/tuf/repo/keystore.py b/tuf/repo/keystore.py
index ce0c1f4d..b16f7ca1 100755
--- a/tuf/repo/keystore.py
+++ b/tuf/repo/keystore.py
@@ -288,9 +288,9 @@ def load_keystore_from_keyfiles(directory_name, keyids, passwords):
           # supported.
           if keydata['keytype'] in _SUPPORTED_KEY_TYPES:
             # 'keydata' is stored in KEY_SCHEMA format.  Call
-            # create_from_metadata_format() to get the key in RSAKEY_SCHEMA
+            # format_metadata_to_key() to get the key in RSAKEY_SCHEMA
             # format, which is the format expected by 'add_rsakey()'.
-            rsa_key = tuf.keys.create_from_metadata_format(keydata)
+            rsa_key = tuf.keys.format_metadata_to_key(keydata)
 
             # Ensure the keyid for 'rsa_key' is one of the keys specified in
             # 'keyids'.  If not, do not load the key.
@@ -368,7 +368,7 @@ def save_keystore_to_keyfiles(directory_name):
       keytype = key['keytype']
       keyval = key['keyval']
       key_metadata_format = \
-            tuf.keys.create_in_metadata_format(keytype, keyval, private=True)
+            tuf.keys.format_keyval_to_metadata(keytype, keyval, private=True)
     else:
       logger.warn('The keystore has a key with an unrecognized key type.')
       continue
diff --git a/tuf/repo/signercli.py b/tuf/repo/signercli.py
index 8d5c4b03..09734b8b 100755
--- a/tuf/repo/signercli.py
+++ b/tuf/repo/signercli.py
@@ -693,7 +693,8 @@ def dump_key(keystore_directory):
   if key['keytype'] == 'rsa':
     keytype = key['keytype']
     keyval = key['keyval']
-    key_metadata = tuf.keys.create_in_metadata_format(keytype, keyval,
+    key_metadata = tuf.keys.format_keyval_to_metadata(keytype, keyval,
+    #key_metadata = tuf.keys.create_in_metadata_format(keytype, keyval,
                                                       private=show_private)
   else:
     message = 'The keystore contains an invalid key type.'
@@ -1357,7 +1358,8 @@ def _update_parent_metadata(metadata_directory, delegated_role,
     if role_key['keytype'] == 'rsa':
       keytype = role_key['keytype']
       keyval = role_key['keyval']
-      keys[delegated_keyid] = tuf.keys.create_in_metadata_format(keytype, keyval)
+      keys[delegated_keyid] = tuf.keys.format_keyval_to_metadata(keytype, keyval)
+      #keys[delegated_keyid] = tuf.keys.create_in_metadata_format(keytype, keyval)
     else:
       message = 'Invalid keytype encountered: '+delegated_keyid+'\n'
       raise tuf.RepositoryError(message)
diff --git a/tuf/repo/signerlib.py b/tuf/repo/signerlib.py
index 5df17363..c2a71f63 100755
--- a/tuf/repo/signerlib.py
+++ b/tuf/repo/signerlib.py
@@ -22,6 +22,7 @@
 import os
 import ConfigParser
 import logging
+import time
 
 import tuf
 import tuf.formats
@@ -288,7 +289,7 @@ def generate_root_metadata(config_filepath, version):
         if key['keytype'] in ['rsa', 'ed25519']:
           keytype = key['keytype']
           keyval = key['keyval']
-          keydict[keyid] = tuf.keys.create_in_metadata_format(keytype, keyval)
+          keydict[keyid] = tuf.keys.format_keyval_to_metadata(keytype, keyval)
         # This is not a recognized key.  Raise an exception.
         else:
           raise tuf.Error('Unsupported keytype: '+keyid)
@@ -309,7 +310,8 @@ def generate_root_metadata(config_filepath, version):
                         3600 * 24 * expiration['days'])
 
   # Generate the root metadata object.
-  root_metadata = tuf.formats.RootFile.make_metadata(version, expiration_seconds,
+  expiration_date = tuf.formats.format_time(time.time()+expiration_seconds)
+  root_metadata = tuf.formats.RootFile.make_metadata(version, expiration_date,
                                                      keydict, roledict)
 
   # Note: make_signable() returns the following dictionary: