Use consistent table names