Updated the handler so it actually does full direction names.