Fix file and relation names

Just a quick patch to make the file names and relation names conform to the Rails convention of having underscores between words.