fix naming conventions to match solution