change default name in case of conflict
Merge pull request #2 from andrewcartwright1/CoreFrontEndFramework

change default name in case of conflict