Any reason to switch to camel case filenames? Seems odd to mix given everything else is underscores.