Not yested covered with testing. Changes database columns for more presentable names and for future use to connect additional model types. For #4316
