rename Base classes