Refactoring to resolve filename conflicts and some literals