Renamed files to remove the data- prefix
Updated the id comparison functions
Rename header imports within my files
Merge branch 'master' into cli