Change Json service and class names