Fixed json files and event names