Fix code for renamed Spiro.Models types