Updated legacy handler naming to match AppHandler