multiple bug fixes

fixed bad naming
corrected file paths