Finish changing naming convention of database output