SCHEMA-103. Fix updated import statements.