Changed the .cpp and .h file names to be consistant.