Filename refactoring, to ease identification of framework code