Fixed model name clash