Change module name and improve expirationUnit support.