Renamed card types
Merge branch 'master' into demo