Added eraser, refactored names