naming convention cleanup and add request not found handler