renaming a few more canvas models to avoid conflicts