Rename handlers
Fix tests