Harmonise table name usage