Changing name and JSON cleanup code