Revert "Renaming models, foreign key for Users."

This reverts commit 5a4aeb6480fd59f2383d7c35c03743175f813cb1.