New names1

Rename models for linux support. for #186