Models in separate file, renamed tables according to agreement