Modifier changed to brush
Some names refactoring