Some feedback based on jco review, fix the build because of caps in a filename