Fixed cases in some type-names that got altered in the refactoring process.