Update and rename calc to tz