Table names for production fixed