Buildable version, account for changed class names