Changed name to Calculator