Update references to usage classes