Refactoring Smurf naming removed