changed names to avoid java class names collision