Error debugging

Debugging compiling errors and made small name changes to incorrectly
named files. NOTE: Compile warnings still exist.