renaming classes for merging w/ backend