SI-4628 Remove primitive type aliases
Merge pull request #99 from soc/SI-4628

SI-4628 Remove primitive type aliases