renamed classes to match other declarations.