Switched Handler names to camelcase