Changed the name of const_string to string, changed header name appropriately