fix relation names to follow rails convention
fix file names to follow rails convention