Fixed issues as per feedback
Fixed tests to account for the new data type name