Change module name and improve expirationUnit support.

These are the changes as per our conversation in Issue #17 .