Rename classes to be consistent with TypeScript.