updated class names and constant names, avoiding collision with wikimedia repository.