Removing smurf naming!