Change names of measure to type to avoid potential name clash / confusion.
5 files changed