OS X naming (Issue 1)