change class names to avoid variable name collision