Problem 1 naming fixes