Rewrite of class names and di