Rename Base classes