Update MarsEdit for new naming conventions
Merge pull request #1582 from Cottser/marsedit

Update MarsEdit for new naming conventions