Sample data and naming fixes.