Merge pull request #174 from kanoi/master Ensure everyone sees the same screen/api name as the previous version