Some basic traits and tables name fix