Removed the hyphens from json variable names