Updated models and various renamings