point source refactoring and sourceAttribute renaming