Changes to normalize names and add generic json responses