Fixed references to models, components and did it right this time