Renamed MappingReader to MetadataReader
Renamed drivers
Fixed an incorrect service name
Fixed namespace for Naming testcases