Example naming fixes