Clean up bad verb and path mixups