Rename some of the classes removing can- prefix