Refactored TypeMaker to use new terminology and split PropertyKey and EdgeLabel maker into separate builder classes.
Fixed variable type declaration issue in groovy test