Renamed ScalarList and Email types