SI-4628 Remove primitive type aliases